lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cpoersc...@apache.org
Subject [4/4] lucene-solr:jira/solr-8668: SOLR-8668: remove <mergePolicy>myclass</mergePolicy> assertWarnOrFail
Date Fri, 12 May 2017 14:05:41 GMT
SOLR-8668: remove <mergePolicy>myclass</mergePolicy> assertWarnOrFail


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

Branch: refs/heads/jira/solr-8668
Commit: 17493c9640713c11b4e00757378d241256a8272f
Parents: 970c2f9
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Fri May 12 15:02:15 2017 +0100
Committer: Christine Poerschke <cpoerschke@apache.org>
Committed: Fri May 12 15:02:15 2017 +0100

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17493c96/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
index 740d2d8..025ad53 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -124,9 +124,6 @@ public class SolrIndexConfig implements MapSerializable {
     assertWarnOrFail("The <mergeScheduler>myclass</mergeScheduler> syntax is
no longer supported in solrconfig.xml. Please use syntax <mergeScheduler class=\"myclass\"/>
instead.",
         !((solrConfig.getNode(prefix + "/mergeScheduler", false) != null) && (solrConfig.get(prefix
+ "/mergeScheduler/@class", null) == null)),
         true);
-    assertWarnOrFail("The <mergePolicy>myclass</mergePolicy> syntax is no longer
supported in solrconfig.xml. Please use syntax <mergePolicy class=\"myclass\"/> instead.",
-        !((solrConfig.getNode(prefix + "/mergePolicy", false) != null) && (solrConfig.get(prefix
+ "/mergePolicy/@class", null) == null)),
-        true);
     assertWarnOrFail("The <luceneAutoCommit>true|false</luceneAutoCommit> parameter
is no longer valid in solrconfig.xml.",
         solrConfig.get(prefix + "/luceneAutoCommit", null) == null,
         true);


Mime
View raw message