lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwe...@apache.org
Subject [lucene-solr] 01/01: Merge remote-tracking branch 'origin/master' into gradle-master
Date Tue, 03 Dec 2019 17:46:32 GMT
This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 7c26c6de029f3d7f6179182ab6f11b7aabcf08b4
Merge: 85e0e4f 323b214
Author: Dawid Weiss <dawid.weiss@carrotsearch.com>
AuthorDate: Tue Dec 3 18:45:12 2019 +0100

    Merge remote-tracking branch 'origin/master' into gradle-master

 .github/PULL_REQUEST_TEMPLATE.md                   |   2 +
 lucene/CHANGES.txt                                 |   4 +-
 .../lucene/queries/intervals/IntervalQuery.java    |   7 +-
 .../queries/intervals/IntervalScoreFunction.java   |   4 +-
 .../queries/intervals/TestIntervalQuery.java       |  20 ++
 lucene/tools/junit4/solr-tests.policy              |  97 ++++++--
 solr/CHANGES.txt                                   |   8 +
 .../solr/analytics/ExpressionFactoryTest.java      |   6 +
 .../function/field/AbstractAnalyticsFieldTest.java |   3 +
 .../apache/solr/cloud/ExclusiveSliceProperty.java  |   2 +-
 .../solr/cloud/RecoveringCoreTermWatcher.java      |   3 +-
 .../java/org/apache/solr/cloud/ZkShardTerms.java   | 259 +++------------------
 .../cloud/api/collections/CreateCollectionCmd.java |   2 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |  30 +--
 .../autoscaling/sim/SimClusterStateProvider.java   |   4 +-
 .../solr/cloud/overseer/ClusterStateMutator.java   |   4 +-
 .../solr/cloud/overseer/CollectionMutator.java     |   2 +-
 .../apache/solr/cloud/overseer/NodeMutator.java    |   4 +-
 .../apache/solr/cloud/overseer/ReplicaMutator.java |  25 +-
 .../apache/solr/cloud/overseer/SliceMutator.java   |  14 +-
 .../apache/solr/cloud/ClusterStateMockUtil.java    |  12 +-
 .../org/apache/solr/cloud/ClusterStateTest.java    |   8 +-
 .../OverseerCollectionConfigSetProcessorTest.java  |   4 +-
 .../test/org/apache/solr/cloud/SliceStateTest.java |  14 +-
 .../org/apache/solr/cloud/TestHashPartitioner.java |   2 +-
 .../org/apache/solr/cloud/ZkShardTermsTest.java    |   3 +-
 .../solr/cloud/api/collections/AssignTest.java     |  18 +-
 .../test/org/apache/solr/core/CoreSorterTest.java  |   2 +-
 solr/server/etc/jetty.xml                          |  41 +++-
 solr/solr-ref-guide/src/aliases.adoc               |   2 +-
 .../solr-ref-guide/src/aws-solrcloud-tutorial.adoc |   2 +-
 .../src/common-query-parameters.adoc               |   2 +-
 solr/solr-ref-guide/src/highlighting.adoc          |   2 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |   2 +-
 .../src/json-faceting-domain-changes.adoc          |   2 +-
 .../src/major-changes-in-solr-7.adoc               |   2 +-
 .../src/meta-docs/asciidoc-syntax.adoc             |   2 +-
 solr/solr-ref-guide/src/other-parsers.adoc         |   2 +-
 .../src/shards-and-indexing-data-in-solrcloud.adoc |   2 +-
 solr/solr-ref-guide/src/spatial-search.adoc        |   2 +-
 .../src/stream-decorator-reference.adoc            |   4 +-
 solr/solr-ref-guide/src/using-jmx-with-solr.adoc   |   2 +-
 .../apache/solr/client/solrj/cloud/ShardTerms.java | 256 ++++++++++++++++++++
 .../org/apache/solr/common/cloud/ClusterState.java |  10 +-
 .../java/org/apache/solr/common/cloud/Replica.java |  12 +-
 .../java/org/apache/solr/common/cloud/Slice.java   |  17 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |   5 +
 .../client/solrj/cloud/autoscaling/TestPolicy.java |  43 ++--
 .../routing/NodePreferenceRulesComparatorTest.java |   8 +-
 .../solrj/routing/ReplicaListTransformerTest.java  |   3 +-
 ...RequestReplicaListTransformerGeneratorTest.java |   8 +-
 .../ShufflingReplicaListTransformerTest.java       |   2 +-
 52 files changed, 605 insertions(+), 391 deletions(-)


Mime
View raw message