Shalin Shekhar Mangar d3b5adfd62 Merge remote-tracking branch 'origin/feature/autoscaling' into feature/autoscaling
# Conflicts:
#	solr/core/src/java/org/apache/solr/cloud/ZkController.java
#	solr/core/src/test/org/apache/solr/cloud/autoscaling/TestPolicyCloud.java
2017-06-07 19:09:24 +05:30
..
2017-04-28 15:54:46 -04:00