You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/02/15 20:47:16 UTC
[04/50] lucene-solr:master: Merge branch 'apache-https-master' into
jira/solr-8593
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/01f0ef4c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/01f0ef4c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/01f0ef4c
Branch: refs/heads/master
Commit: 01f0ef4cbee13cff072f471a5836f7022187f8e5
Parents: 4f794d0 3b49705
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Oct 28 10:29:33 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Fri Oct 28 10:29:33 2016 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 4 +
solr/bin/solr | 39 +-
solr/bin/solr.in.sh | 6 +
.../client/solrj/embedded/JettySolrRunner.java | 10 +
.../java/org/apache/solr/cloud/rule/Snitch.java | 34 -
.../src/java/org/apache/solr/util/SolrCLI.java | 2 +-
.../configsets/cloud-dynamic/conf/schema.xml | 2 +
.../solr/configsets/cloud-hdfs/conf/schema.xml | 28 +
.../configsets/cloud-hdfs/conf/solrconfig.xml | 50 +
.../cloud-minimal-jmx/conf/schema.xml | 28 +
.../cloud-minimal-jmx/conf/solrconfig.xml | 50 +
.../cloud/CollectionTooManyReplicasTest.java | 301 ++--
.../cloud/CollectionsAPIDistributedZkTest.java | 1303 +++++-------------
.../solr/cloud/CreateCollectionCleanupTest.java | 6 +-
.../apache/solr/cloud/CustomCollectionTest.java | 491 ++-----
.../apache/solr/cloud/MigrateRouteKeyTest.java | 1 +
.../org/apache/solr/cloud/RecoveryZkTest.java | 166 +--
.../org/apache/solr/cloud/ShardSplitTest.java | 6 +-
.../solr/cloud/TestClusterProperties.java | 45 +
.../cloud/TestDeleteCollectionOnDownNodes.java | 65 +
.../HdfsCollectionsAPIDistributedZkTest.java | 33 +-
.../solr/cloud/hdfs/HdfsRecoveryZkTest.java | 22 +-
.../solr/security/BasicAuthStandaloneTest.java | 1 -
.../solrj/request/CollectionAdminRequest.java | 16 +-
.../client/solrj/request/CoreAdminRequest.java | 6 +
.../client/solrj/request/UpdateRequest.java | 8 +
.../org/apache/solr/common/cloud/Slice.java | 10 +
.../apache/solr/cloud/MiniSolrCloudCluster.java | 35 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 6 +-
29 files changed, 1094 insertions(+), 1680 deletions(-)
----------------------------------------------------------------------