You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2020/09/16 06:36:37 UTC
[lucene-solr] 02/07: Merge branch 'master' of
github.com:apache/lucene-solr
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch jira/solr14871
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit a8099d6367904d23f96f5ece510abbbb6f1bcdbf
Merge: 27a14fe 4d46caa
Author: noblepaul <no...@gmail.com>
AuthorDate: Mon Sep 14 18:47:20 2020 +1000
Merge branch 'master' of github.com:apache/lucene-solr
lucene/CHANGES.txt | 4 +
.../org/apache/lucene/index/ByteSliceWriter.java | 7 +-
.../apache/lucene/index/DefaultIndexingChain.java | 95 +++++++++++++-----
.../lucene/index/DocumentsWriterFlushControl.java | 3 +-
.../lucene/index/DocumentsWriterPerThread.java | 110 +++++----------------
.../lucene/index/DocumentsWriterPerThreadPool.java | 11 +--
.../apache/lucene/index/FreqProxTermsWriter.java | 6 +-
.../java/org/apache/lucene/index/IndexWriter.java | 3 +-
.../lucene/index/SortingTermVectorsConsumer.java | 18 ++--
.../apache/lucene/index/TermVectorsConsumer.java | 20 ++--
.../java/org/apache/lucene/index/TermsHash.java | 6 +-
.../index/TestDocumentsWriterPerThreadPool.java | 2 -
.../org/apache/lucene/index/TestIndexWriter.java | 4 +-
.../apache/lucene/index/TestIndexWriterConfig.java | 8 +-
.../search/matchhighlight/TestPassageSelector.java | 1 +
settings.gradle | 2 +
.../src/java/org/apache/solr/core/ConfigSet.java | 13 ++-
17 files changed, 160 insertions(+), 153 deletions(-)