You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/06/07 14:11:54 UTC

[50/50] [abbrv] lucene-solr:feature/autoscaling: Completing merge from master

Completing merge from master


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

Branch: refs/heads/feature/autoscaling
Commit: d158f694b7961f974842a8be84f1cb839b4b6c8b
Parents: d3b5adf
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Jun 7 19:11:53 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Jun 7 19:11:53 2017 +0530

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/cloud/ZkController.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d158f694/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index de41871..8fa3d1b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -56,6 +56,7 @@ import org.apache.solr.cloud.overseer.SliceMutator;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.cloud.*;
+import org.apache.solr.common.cloud.Replica.Type;
 import org.apache.solr.common.params.CollectionParams;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.SolrParams;