lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject [2/2] lucene-solr:branch_6x: Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Date Fri, 20 May 2016 20:26:28 GMT
Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x


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

Branch: refs/heads/branch_6x
Commit: ebcc9910344486ca84d543fa98ead40080511feb
Parents: 7bd6d94 78e92a0
Author: Uwe Schindler <uschindler@apache.org>
Authored: Fri May 20 22:26:14 2016 +0200
Committer: Uwe Schindler <uschindler@apache.org>
Committed: Fri May 20 22:26:14 2016 +0200

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   9 +
 .../lucene/search/spans/SpanNearQuery.java      |   2 +-
 .../search/spans/TestNearSpansOrdered.java      |  24 +-
 lucene/highlighter/build.xml                    |   3 +-
 .../highlight/WeightedSpanTermExtractor.java    |  38 ++-
 .../search/highlight/HighlighterTest.java       |  59 +++-
 .../apache/lucene/spatial3d/geom/Bounds.java    |  11 +
 .../spatial3d/geom/GeoComplexPolygon.java       |   2 +-
 .../spatial3d/geom/GeoLongitudeSlice.java       |   1 +
 .../spatial3d/geom/GeoNorthRectangle.java       |   1 +
 .../lucene/spatial3d/geom/GeoRectangle.java     |   1 +
 .../spatial3d/geom/GeoSouthRectangle.java       |   1 +
 .../spatial3d/geom/GeoWideLongitudeSlice.java   |   1 +
 .../spatial3d/geom/GeoWideNorthRectangle.java   |   1 +
 .../lucene/spatial3d/geom/GeoWideRectangle.java |   1 +
 .../spatial3d/geom/GeoWideSouthRectangle.java   |   1 +
 .../lucene/spatial3d/geom/LatLonBounds.java     |   6 +
 .../org/apache/lucene/spatial3d/geom/Plane.java | 216 +++++++++++++++
 .../apache/lucene/spatial3d/geom/XYZBounds.java |   7 +
 .../apache/lucene/spatial3d/TestGeo3DPoint.java |   3 +-
 .../lucene/spatial3d/geom/GeoBBoxTest.java      |  11 +
 .../lucene/spatial3d/geom/GeoCircleTest.java    |   4 -
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |   6 -
 solr/CHANGES.txt                                |   8 +-
 .../org/apache/solr/handler/GraphHandler.java   |   1 +
 .../apache/solr/search/mlt/CloudMLTQParser.java |  19 +-
 .../configsets/cloud-dynamic/conf/schema.xml    | 275 ++++++++++++++++++
 .../cloud-dynamic/conf/solrconfig.xml           |  48 ++++
 .../solr/configsets/doc-expiry/conf/schema.xml  | 271 ++++++++++++++++++
 .../solrconfig.snippet.randomindexconfig.xml    |  47 ++++
 .../configsets/doc-expiry/conf/solrconfig.xml   |  96 +++++++
 .../exitable-directory/conf/schema.xml          |  28 ++
 .../exitable-directory/conf/solrconfig.xml      | 117 ++++++++
 .../solr/client/solrj/ConnectionReuseTest.java  | 205 ++++++++------
 .../apache/solr/cloud/CleanupOldIndexTest.java  | 105 ++-----
 .../cloud/CloudExitableDirectoryReaderTest.java |  47 ++--
 .../apache/solr/cloud/ConfigSetsAPITest.java    |  39 ++-
 ...DistribDocExpirationUpdateProcessorTest.java | 137 ++++-----
 .../solr/cloud/DistributedVersionInfoTest.java  | 102 +++----
 ...stributedQueryComponentOptimizationTest.java | 236 +++++++++-------
 .../solr/search/mlt/CloudMLTQParserTest.java    | 277 ++++++++++---------
 .../conf/velocity/cluster.vm                    |   2 +-
 .../org/apache/solr/client/solrj/SolrQuery.java |  11 +-
 .../solrj/io/graph/GatherNodesStream.java       |  24 +-
 .../client/solrj/io/stream/CloudSolrStream.java |  29 +-
 .../client/solrj/io/stream/FacetStream.java     |   3 +
 .../apache/solr/common/cloud/DocCollection.java |   9 +
 .../org/apache/solr/common/cloud/Replica.java   |   5 +
 .../apache/solr/common/cloud/ZkStateReader.java |   5 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  39 +++
 .../cloud/TestCollectionStateWatchers.java      |   5 +-
 .../cloud/AbstractFullDistribZkTestBase.java    |   8 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   9 +
 .../apache/solr/cloud/SolrCloudTestCase.java    |   6 +
 54 files changed, 1984 insertions(+), 638 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ebcc9910/lucene/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message