You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2018/07/24 18:30:59 UTC
[3/4] lucene-solr:branch_7x: Merge remote-tracking branch
'refs/remotes/origin/branch_7x' into branch_7x
Merge remote-tracking branch 'refs/remotes/origin/branch_7x' into branch_7x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/20677f47
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/20677f47
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/20677f47
Branch: refs/heads/branch_7x
Commit: 20677f47f15bb172c6dcc61094460c7e2432dd38
Parents: a919242 bd51b0a
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Jul 24 10:52:55 2018 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Tue Jul 24 10:52:55 2018 -0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 2 ++
.../apache/lucene/index/FrozenBufferedUpdates.java | 12 ++++++------
.../java/org/apache/lucene/index/IndexWriter.java | 17 ++++++++++++++++-
.../org/apache/lucene/index/TestAddIndexes.java | 2 +-
.../apache/lucene/index/TestForceMergeForever.java | 2 +-
.../org/apache/lucene/index/TestIndexWriter.java | 16 ++++++++--------
.../apache/lucene/index/TestPerSegmentDeletes.java | 6 +++---
.../index/TestSoftDeletesRetentionMergePolicy.java | 14 +++++++-------
.../apache/lucene/index/TestTieredMergePolicy.java | 16 ++++++++--------
9 files changed, 52 insertions(+), 35 deletions(-)
----------------------------------------------------------------------