You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/06/01 01:51:43 UTC

[2/2] 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/82f2a353
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/82f2a353
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/82f2a353

Branch: refs/heads/master
Commit: 82f2a35396b5988092d9316f54433f52685fdb80
Parents: 5d0aa60 7da9e9d
Author: Cao Manh Dat <da...@apache.org>
Authored: Thu Jun 1 08:51:17 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Thu Jun 1 08:51:17 2017 +0700

----------------------------------------------------------------------
 .../spatial3d/geom/GeoPolygonFactory.java       |  63 ++
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |  63 ++
 solr/CHANGES.txt                                |   7 +
 .../org/apache/solr/cloud/AddReplicaCmd.java    |   3 +-
 .../solr/core/snapshots/SolrSnapshotsTool.java  |   7 +-
 .../solr/handler/admin/ConfigSetsHandler.java   |   4 +
 .../resources/apispec/collections.Commands.json |  14 +-
 .../collections.collection.shards.Commands.json |   5 +
 .../AbstractCloudBackupRestoreTestCase.java     |  11 +-
 .../CollectionsAPIAsyncDistributedZkTest.java   |  62 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |  12 +-
 ...ConcurrentDeleteAndCreateCollectionTest.java |  12 +-
 .../org/apache/solr/cloud/DeleteStatusTest.java |  23 -
 .../org/apache/solr/cloud/ForceLeaderTest.java  |  25 +-
 .../cloud/FullSolrCloudDistribCmdsTest.java     |  16 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |  36 +-
 .../cloud/LeaderFailoverAfterPartitionTest.java |  10 +-
 .../LeaderInitiatedRecoveryOnCommitTest.java    |  19 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |  63 +-
 .../org/apache/solr/cloud/ReplaceNodeTest.java  |   4 +-
 .../solr/cloud/ReplicationFactorTest.java       |   4 +-
 .../apache/solr/cloud/RollingRestartTest.java   |   2 +-
 .../org/apache/solr/cloud/ShardSplitTest.java   |   8 +-
 .../cloud/SharedFSAutoReplicaFailoverTest.java  |  24 +-
 .../cloud/SimpleCollectionCreateDeleteTest.java |  13 +-
 .../apache/solr/cloud/TestCollectionAPI.java    |  24 +-
 .../org/apache/solr/cloud/TestPullReplica.java  |  89 +-
 .../cloud/TestRandomRequestDistribution.java    |  15 +-
 .../solr/cloud/TestRequestForwarding.java       |   6 +-
 .../cloud/TestSolrCloudWithKerberosAlt.java     |   9 +-
 .../TestSolrCloudWithSecureImpersonation.java   |   6 +-
 .../org/apache/solr/cloud/TestTlogReplica.java  |  86 +-
 .../apache/solr/handler/TestBlobHandler.java    |  10 +-
 .../solr/handler/admin/TestCollectionAPIs.java  |  38 +-
 .../solr/handler/admin/TestConfigsApi.java      |   2 +-
 .../solr/search/stats/TestDistribIDF.java       |  13 +-
 .../scripts/cloud-scripts/snapshotscli.sh       |   2 +-
 solr/solr-ref-guide/src/codec-factory.adoc      |  24 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc      |   2 +-
 solr/solr-ref-guide/src/css/theme-solr.css      |   2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc       |   2 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc |  24 +-
 .../src/solr-control-script-reference.adoc      |  11 +-
 .../solrj/request/CollectionAdminRequest.java   | 844 ++-----------------
 ...ollectionAdminRequestRequiredParamsTest.java | 137 +--
 .../request/TestCollectionAdminRequest.java     |  84 +-
 .../cloud/AbstractFullDistribZkTestBase.java    |  23 +-
 47 files changed, 693 insertions(+), 1270 deletions(-)
----------------------------------------------------------------------