You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/06/02 10:56:39 UTC

[16/38] lucene-solr:jira/solr-8668: 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/3291ef88
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3291ef88
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3291ef88

Branch: refs/heads/jira/solr-8668
Commit: 3291ef884d26e3f8cb43707f2acdf674f3e51c01
Parents: 08ea9a7 872b0db
Author: Karl Wright <Da...@gmail.com>
Authored: Wed May 31 15:04:40 2017 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Wed May 31 15:04:40 2017 -0400

----------------------------------------------------------------------
 solr/CHANGES.txt                                |   5 +
 .../solr/core/snapshots/SolrSnapshotsTool.java  |   7 +-
 .../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 +-
 .../cloud/TestRandomRequestDistribution.java    |  15 +-
 .../solr/cloud/TestRequestForwarding.java       |   6 +-
 .../cloud/TestSolrCloudWithKerberosAlt.java     |   9 +-
 .../TestSolrCloudWithSecureImpersonation.java   |   6 +-
 .../apache/solr/handler/TestBlobHandler.java    |  10 +-
 .../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/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 +-
 36 files changed, 362 insertions(+), 1230 deletions(-)
----------------------------------------------------------------------