You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2016/04/06 23:39:38 UTC

[3/3] lucene-solr:master: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eda2a319
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eda2a319
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eda2a319

Branch: refs/heads/master
Commit: eda2a319595d01efaf05ed4bc4574682b91e7aaf
Parents: 68e792e 370f2d3
Author: Karl Wright <Da...@gmail.com>
Authored: Wed Apr 6 17:18:10 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Wed Apr 6 17:18:10 2016 -0400

----------------------------------------------------------------------
 .../apache/lucene/store/TestRateLimiter.java    |   2 +-
 .../lucene/queryparser/xml/TestCoreParser.java  |  15 +-
 .../org/apache/lucene/document/LatLonPoint.java |   9 +-
 .../apache/lucene/document/TestLatLonPoint.java | 263 +++++++------------
 solr/CHANGES.txt                                |   9 +
 .../solr/analytics/expression/Expression.java   |  14 +-
 .../src/java/org/apache/solr/hadoop/GoLive.java |  27 +-
 .../solr/hadoop/MapReduceIndexerTool.java       |   7 +-
 .../apache/solr/hadoop/ZooKeeperInspector.java  |   9 +-
 .../solr/SolrMorphlineZkAvroTest.java           |  14 +-
 .../java/org/apache/solr/cloud/Overseer.java    |   1 +
 .../OverseerAutoReplicaFailoverThread.java      |   8 +-
 .../apache/solr/cloud/OverseerTaskQueue.java    |  21 +-
 .../solr/cloud/overseer/ZkStateWriter.java      |   4 +-
 .../org/apache/solr/core/ConfigSetService.java  |   9 +-
 .../org/apache/solr/core/CoreContainer.java     |  35 ++-
 .../apache/solr/core/HdfsDirectoryFactory.java  |  21 +-
 .../org/apache/solr/core/JmxMonitoredMap.java   |  23 +-
 .../src/java/org/apache/solr/core/SolrCore.java |  83 +++---
 .../java/org/apache/solr/core/SolrCores.java    |  25 +-
 .../apache/solr/core/SolrInfoMBeanWrapper.java  |  62 +++++
 .../solr/handler/CdcrReplicatorScheduler.java   |  19 +-
 .../solr/handler/MoreLikeThisHandler.java       |  12 +-
 .../handler/component/HttpShardHandler.java     |  97 ++++---
 .../request/PerSegmentSingleValuedFaceting.java |   9 +-
 .../org/apache/solr/request/SimpleFacets.java   |  35 ++-
 .../solr/schema/AbstractSpatialFieldType.java   |   7 +-
 .../apache/solr/search/SolrFieldCacheMBean.java |  15 +-
 .../apache/solr/update/SolrCmdDistributor.java  |  11 +-
 .../solr/cloud/BasicDistributedZkTest.java      |  80 +++---
 .../solr/cloud/OverseerTaskQueueTest.java       |  67 +++++
 .../apache/solr/core/TestJmxMonitoredMap.java   |  37 +++
 .../org/apache/solr/search/TestRecovery.java    |   7 +-
 .../apache/solr/search/TestRecoveryHdfs.java    |  13 +-
 .../solr/search/TestSolrFieldCacheMBean.java    |  36 ++-
 .../apache/solr/update/AddBlockUpdateTest.java  |  20 +-
 .../test/org/apache/solr/update/TestUpdate.java |  16 +-
 .../solr/client/solrj/impl/CloudSolrClient.java |   7 +-
 .../solr/client/solrj/impl/HttpSolrClient.java  |   7 +-
 .../solrj/impl/Krb5HttpClientBuilder.java       |  52 ++--
 .../solrj/impl/SolrHttpClientBuilder.java       |   8 +-
 .../client/solrj/io/comp/FieldComparator.java   |  42 ++-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |  14 +-
 43 files changed, 634 insertions(+), 638 deletions(-)
----------------------------------------------------------------------