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/16 17:20:52 UTC

[12/46] 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/7a493710
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a493710
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a493710

Branch: refs/heads/jira/solr-11833
Commit: 7a4937106c0a551a958a726c6c6fbf9145c4637d
Parents: 832e897 19b4483
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Apr 12 07:09:30 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Apr 12 07:09:30 2018 -0400

----------------------------------------------------------------------
 .../org/apache/lucene/index/PendingDeletes.java |  8 ++++++-
 .../apache/lucene/index/PendingSoftDeletes.java |  3 ++-
 .../apache/lucene/index/ReadersAndUpdates.java  |  1 +
 .../apache/lucene/index/TestPendingDeletes.java |  8 +++----
 .../lucene/index/TestPendingSoftDeletes.java    | 23 +++++++++++++++-----
 .../apache/lucene/search/TestLRUQueryCache.java |  9 ++++----
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |  3 ---
 7 files changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------