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 2020/07/01 15:29:46 UTC

[lucene-solr] 02/11: Merge branch 'master' into jira/solr-12847-2

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-12847-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 93af8ce8ee4a7221ec88a149d81268566ce43d5d
Merge: 25f1351 18af632
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Apr 14 20:17:57 2020 +0200

    Merge branch 'master' into jira/solr-12847-2

 .../org/apache/lucene/index/DocumentsWriter.java   |  17 ++-
 .../lucene/index/DocumentsWriterDeleteQueue.java   |  87 ++++++++++---
 .../lucene/index/DocumentsWriterFlushControl.java  |   8 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |  18 +--
 .../search/ControlledRealTimeReopenThread.java     |  18 ++-
 .../org/apache/lucene/index/TestIndexWriter.java   | 136 +++++++++++++++++++++
 .../search/TestControlledRealTimeReopenThread.java |   8 +-
 .../solr/handler/admin/HealthCheckHandler.java     |   2 +-
 8 files changed, 250 insertions(+), 44 deletions(-)