lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [3/3] lucene-solr:jira/solr-11285-sim: Merge branch 'jira/solr-11285' into jira/solr-11285-sim
Date Fri, 06 Oct 2017 10:00:59 GMT
Merge branch 'jira/solr-11285' into jira/solr-11285-sim


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/92e5a6cf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/92e5a6cf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/92e5a6cf

Branch: refs/heads/jira/solr-11285-sim
Commit: 92e5a6cf7bee70ab749e37a0c9602f43e1ac1ee6
Parents: 5372c02 e625512
Author: Andrzej Bialecki <ab@apache.org>
Authored: Fri Oct 6 12:00:49 2017 +0200
Committer: Andrzej Bialecki <ab@apache.org>
Committed: Fri Oct 6 12:00:49 2017 +0200

----------------------------------------------------------------------
 .../DelegatingClusterStateProvider.java         | 51 ++++++++++++++++----
 .../cloud/autoscaling/DistribStateManager.java  |  1 -
 .../client/solrj/cloud/autoscaling/Policy.java  | 46 +++++++++---------
 .../solrj/cloud/autoscaling/ReplicaInfo.java    | 30 ++++++++----
 .../client/solrj/cloud/autoscaling/Row.java     |  3 +-
 .../solrj/cloud/autoscaling/TestPolicy.java     |  8 +--
 6 files changed, 91 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/92e5a6cf/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/92e5a6cf/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
index ba5339a,67d65fb..fc22cd7
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
@@@ -36,7 -36,7 +36,6 @@@ import java.util.function.Consumer
  import java.util.function.Supplier;
  import java.util.stream.Collectors;
  
--import org.apache.solr.client.solrj.SolrClient;
  import org.apache.solr.client.solrj.SolrRequest;
  import org.apache.solr.client.solrj.cloud.autoscaling.Clause.Violation;
  import org.apache.solr.client.solrj.impl.ClusterStateProvider;


Mime
View raw message