You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by gu...@apache.org on 2019/02/06 15:47:57 UTC

[lucene-solr] 02/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr into solr-13131

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

gus pushed a commit to branch solr-13131
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit c9ab16cddf64a4fb0cff44ce6cb5f885d626833b
Merge: cffca259f 1d13d3d
Author: Gus Heck <gu...@apache.org>
AuthorDate: Wed Feb 6 09:47:53 2019 -0500

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr into solr-13131

 solr/CHANGES.txt                                   |  18 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   6 +
 .../java/org/apache/solr/handler/IndexFetcher.java | 108 +++++++++++-
 .../apache/solr/handler/ReplicationHandler.java    |   9 +
 .../apache/solr/request/SolrQueryRequestBase.java  |  32 ++--
 .../apache/solr/update/DefaultSolrCoreState.java   |   6 +-
 .../solr/handler/TestReplicationHandler.java       |  10 +-
 .../TestReplicationHandlerDiskOverFlow.java        | 190 +++++++++++++++++++++
 8 files changed, 353 insertions(+), 26 deletions(-)