From 6b91456f73f227791aad9f4ff2f18a2827f7ad09 Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Fri, 21 Nov 2014 12:50:23 +0000 Subject: [PATCH] SOLR-6533 fixing test failures http://jenkins.thetaphi.de/job/Lucene-Solr-trunk-Linux/11645 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1640909 13f79535-47bb-0310-9956-ffa450edef68 --- solr/core/src/java/org/apache/solr/core/SolrConfig.java | 1 - .../src/java/org/apache/solr/handler/SolrConfigHandler.java | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java index 5c034098cca..70a5af0ef26 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java +++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java @@ -781,7 +781,6 @@ public class SolrConfig extends Config implements MapSerializable{ public ConfigOverlay getOverlay() { if(overlay ==null) { overlay = getConfigOverlay(getResourceLoader()); - log.info("$$$overlay_version "+ overlay.getZnodeVersion()); } return overlay; } diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java index c63f4cf14b2..3bdccfcb276 100644 --- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java @@ -19,6 +19,7 @@ package org.apache.solr.handler; import java.io.IOException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -32,7 +33,9 @@ import org.apache.solr.cloud.ZkSolrResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.ZkNodeProps; +import org.apache.solr.common.params.CollectionParams; import org.apache.solr.common.params.CommonParams; +import org.apache.solr.common.params.CoreAdminParams; import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ContentStream; @@ -44,6 +47,7 @@ import org.apache.solr.core.PluginInfo; import org.apache.solr.core.SolrConfig; import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrResourceLoader; +import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse;