Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/autoscaling 

# Conflicts:
#	solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
This commit is contained in:
Shalin Shekhar Mangar 2017-06-28 11:54:23 +05:30
parent 4239896e6d b99ee2b136
commit 8d668503d8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/solrj/src/test/org/apache/solr/cloud/autoscaling/TestPolicy.java → solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.cloud.autoscaling;
package org.apache.solr.client.solrj.cloud.autoscaling;
import java.io.IOException;