You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2019/12/18 16:38:41 UTC
[lucene-solr] 03/36: Merge branch 'master' into star-123
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-13579
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit ad6eafb80c9195d2c0c01bdf21e78fd93da6f430
Merge: 51da363 2e468ab
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Jun 19 13:03:03 2019 +0200
Merge branch 'master' into star-123
lucene/CHANGES.txt | 12 +
.../org/apache/lucene/search/IndexSearcher.java | 22 +-
.../java/org/apache/lucene/store/Directory.java | 10 +
.../java/org/apache/lucene/store/FSDirectory.java | 3 +-
.../apache/lucene/store/FileSwitchDirectory.java | 27 +-
.../org/apache/lucene/util/IntArrayDocIdSet.java | 13 +-
.../lucene/store/TestFileSwitchDirectory.java | 27 ++
.../org/apache/lucene/util/LuceneTestCase.java | 30 ++-
solr/CHANGES.txt | 12 +-
solr/core/ivy.xml | 1 +
.../java/org/apache/solr/cloud/ZkController.java | 14 +-
.../cloud/api/collections/CreateCollectionCmd.java | 2 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 2 +-
.../solr/cloud/api/collections/DeleteShardCmd.java | 2 +-
.../OverseerCollectionMessageHandler.java | 2 +-
.../solr/handler/component/TermsComponent.java | 15 +-
.../org/apache/solr/cloud/DeleteReplicaTest.java | 6 +-
.../test/org/apache/solr/cloud/OverseerTest.java | 36 +--
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 -
.../apache/solr/cloud/TestSSLRandomization.java | 2 -
.../cloud/TestWaitForStateWithJettyShutdowns.java | 154 +++++++++++
.../cloud/autoscaling/AutoScalingHandlerTest.java | 2 +-
.../solr/common/cloud/ZkStateReaderAccessor.java | 2 +-
.../component/DistributedTermsComponentTest.java | 60 ++++-
.../solr/handler/component/TermsComponentTest.java | 30 +++
.../src/solrcloud-autoscaling-api.adoc | 2 +-
.../solrcloud-autoscaling-policy-preferences.adoc | 8 +-
.../client/solrj/cloud/autoscaling/Clause.java | 75 +++++-
.../solrj/cloud/autoscaling/ReplicaVariable.java | 17 +-
.../client/solrj/impl/BaseCloudSolrClient.java | 68 ++++-
.../solr/client/solrj/impl/HttpClientUtil.java | 34 ++-
.../common/cloud/CollectionStatePredicate.java | 10 +-
.../solr/common/cloud/CollectionStateWatcher.java | 9 +-
...StateWatcher.java => DocCollectionWatcher.java} | 17 +-
.../apache/solr/common/cloud/ZkStateReader.java | 202 ++++++++++++--
.../solr/autoscaling/testSysPropSuggestions.json | 14 +-
.../client/solrj/cloud/autoscaling/TestPolicy.java | 31 ++-
.../solrj/cloud/autoscaling/TestPolicy2.java | 19 +-
.../solr/client/solrj/impl/HttpClientUtilTest.java | 11 +
.../common/cloud/TestCollectionStateWatchers.java | 180 ++++++++-----
.../common/cloud/TestDocCollectionWatcher.java | 291 +++++++++++++++++++++
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
.../solr/cloud/AbstractDistribZkTestBase.java | 6 +-
.../solr/cloud/AbstractFullDistribZkTestBase.java | 4 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../java/org/apache/solr/util/SSLTestConfig.java | 15 +-
46 files changed, 1267 insertions(+), 238 deletions(-)