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

Posted to commits@lucene.apache.org by da...@apache.org on 2019/06/04 12:52:20 UTC

[lucene-solr] 01/03: Merge branch 'master' into jira/SOLR-13434

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

datcm pushed a commit to branch jira/SOLR-13434
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 6cc1c7f02357054a2f486daa4630947c140032c8
Merge: cdbfccd 040340a
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Mon Jun 3 16:39:33 2019 +0100

    Merge branch 'master' into jira/SOLR-13434

 .../org/apache/lucene/index/DocumentsWriter.java   |  28 +++--
 .../lucene/index/DocumentsWriterDeleteQueue.java   | 103 ++++++++++++----
 .../lucene/index/DocumentsWriterFlushQueue.java    |  10 +-
 .../index/TestDocumentsWriterDeleteQueue.java      |  34 +++++-
 solr/CHANGES.txt                                   |   6 +
 .../org/apache/solr/cloud/ElectionContext.java     |  14 ++-
 .../java/org/apache/solr/cloud/LeaderElector.java  |   1 +
 .../java/org/apache/solr/cloud/ZkController.java   |  52 +++++---
 .../apache/solr/cloud/ConnectionManagerTest.java   |   4 +-
 .../test/org/apache/solr/cloud/OverseerTest.java   |  15 ++-
 .../cloud/autoscaling/AutoScalingHandlerTest.java  |  16 +++
 .../client/solrj/cloud/autoscaling/Clause.java     | 135 ++++++++++++++-------
 .../client/solrj/cloud/autoscaling/Policy.java     |   2 +-
 .../client/solrj/cloud/autoscaling/Variable.java   |   5 +-
 .../solrj/cloud/autoscaling/VariableBase.java      |  11 +-
 .../impl/ConcurrentUpdateHttp2SolrClient.java      |   2 +-
 .../solr/common/cloud/ConnectionManager.java       |  38 +++---
 .../common/cloud/DefaultConnectionStrategy.java    |   6 +-
 .../org/apache/solr/common/cloud/OnReconnect.java  |   4 +-
 .../client/solrj/cloud/autoscaling/TestPolicy.java |  29 +++--
 .../solrj/cloud/autoscaling/TestPolicy2.java       |   2 +-
 21 files changed, 372 insertions(+), 145 deletions(-)