Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 37787200D22 for ; Fri, 6 Oct 2017 12:00:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 363191609DF; Fri, 6 Oct 2017 10:00:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7D468160BDB for ; Fri, 6 Oct 2017 12:00:58 +0200 (CEST) Received: (qmail 76885 invoked by uid 500); 6 Oct 2017 10:00:57 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 76791 invoked by uid 99); 6 Oct 2017 10:00:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Oct 2017 10:00:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32809F5C74; Fri, 6 Oct 2017 10:00:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ab@apache.org To: commits@lucene.apache.org Date: Fri, 06 Oct 2017 10:00:59 -0000 Message-Id: <164e672d64e0446491de64fa4cbe6884@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] lucene-solr:jira/solr-11285-sim: Merge branch 'jira/solr-11285' into jira/solr-11285-sim archived-at: Fri, 06 Oct 2017 10:00:59 -0000 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 Authored: Fri Oct 6 12:00:49 2017 +0200 Committer: Andrzej Bialecki 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;