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:15 UTC
[28/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/dc9c6032
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dc9c6032
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dc9c6032
Branch: refs/heads/jira/solr-12095
Commit: dc9c60322a0fb026553d5fe359c8e5c41b0d07ef
Parents: 590e671 ca02e63
Author: Karl Wright <Da...@gmail.com>
Authored: Sat Mar 31 10:04:01 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Sat Mar 31 10:04:01 2018 -0400
----------------------------------------------------------------------
.../lucene/index/BufferedUpdatesStream.java | 4 +-
.../org/apache/lucene/index/IndexWriter.java | 30 +--
.../org/apache/lucene/index/PendingDeletes.java | 193 +++++++++++++++++++
.../apache/lucene/index/ReadersAndUpdates.java | 185 +++++-------------
.../src/java/org/apache/lucene/util/Bits.java | 2 +-
.../apache/lucene/index/TestPendingDeletes.java | 142 ++++++++++++++
solr/CHANGES.txt | 7 +
.../org/apache/solr/cloud/ZkController.java | 22 ++-
.../cloud/autoscaling/NodeAddedTrigger.java | 2 +-
.../solr/cloud/autoscaling/NodeLostTrigger.java | 2 +-
.../org/apache/solr/core/CoreContainer.java | 7 +-
.../solr/cloud/DeleteInactiveReplicaTest.java | 22 ++-
.../solr/cloud/LIROnShardRestartTest.java | 17 +-
.../autoscaling/ComputePlanActionTest.java | 25 ++-
14 files changed, 484 insertions(+), 176 deletions(-)
----------------------------------------------------------------------