You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/04/02 07:38:01 UTC
[14/34] lucene-solr:jira/solr-12095: 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/ae6d29f0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ae6d29f0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ae6d29f0
Branch: refs/heads/jira/solr-12095
Commit: ae6d29f0aeb8e4774e9eec5696f81302359cb0b4
Parents: bc40f6c 0e5374e
Author: Karl Wright <Da...@gmail.com>
Authored: Fri Mar 30 06:43:57 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Fri Mar 30 06:43:57 2018 -0400
----------------------------------------------------------------------
dev-tools/scripts/reproduceJenkinsFailures.py | 1 +
solr/CHANGES.txt | 2 +
.../apache/solr/core/CorePropertiesLocator.java | 2 +-
.../solr/cloud/DocValuesNotIndexedTest.java | 1 +
.../solr/cloud/RestartWhileUpdatingTest.java | 1 +
.../apache/solr/cloud/TestCloudConsistency.java | 2 +
.../org/apache/solr/cloud/TestPullReplica.java | 5 +-
.../apache/solr/cloud/TestSegmentSorting.java | 2 +
.../CollectionsAPIDistributedZkTest.java | 1 +
.../MetricTriggerIntegrationTest.java | 242 ++++
.../NodeAddedTriggerIntegrationTest.java | 300 +++++
.../NodeLostTriggerIntegrationTest.java | 322 +++++
.../NodeMarkersRegistrationTest.java | 269 ++++
.../autoscaling/RestoreTriggerStateTest.java | 169 +++
.../ScheduledTriggerIntegrationTest.java | 142 +++
.../SearchRateTriggerIntegrationTest.java | 217 ++++
.../TriggerCooldownIntegrationTest.java | 238 ++++
.../autoscaling/TriggerIntegrationTest.java | 1161 +-----------------
.../TriggerSetPropertiesIntegrationTest.java | 195 +++
.../autoscaling/sim/TestTriggerIntegration.java | 1 +
.../cloud/hdfs/HdfsBasicDistributedZk2Test.java | 2 +
.../admin/AutoscalingHistoryHandlerTest.java | 3 +-
solr/solr-ref-guide/src/highlighting.adoc | 23 +-
23 files changed, 2183 insertions(+), 1118 deletions(-)
----------------------------------------------------------------------