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 2018/04/23 17:35:24 UTC

[20/40] lucene-solr:jira/solr-11833: 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/48e071f3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/48e071f3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/48e071f3

Branch: refs/heads/jira/solr-11833
Commit: 48e071f350c76cd8783839199ef2b1c372919ec8
Parents: 493bdec 5ef43e9
Author: Karl Wright <Da...@gmail.com>
Authored: Fri Apr 20 03:30:33 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Fri Apr 20 03:30:33 2018 -0400

----------------------------------------------------------------------
 solr/CHANGES.txt                                |   4 +
 .../cloud/autoscaling/NodeLostTriggerTest.java  |   1 +
 .../autoscaling/sim/TestTriggerIntegration.java |   1 +
 .../solr/handler/TestReplicationHandler.java    |  36 +-
 solr/solr-ref-guide/src/css/customstyles.css    |   2 +-
 ...tting-up-an-external-zookeeper-ensemble.adoc | 335 ++++++++++++++-----
 6 files changed, 276 insertions(+), 103 deletions(-)
----------------------------------------------------------------------