You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/08 22:07:39 UTC
[25/50] [abbrv] lucene-solr:jira/solr-10233: SOLR-10572: Removed
three "no longer supported in solrconfig.xml" asserts.
SOLR-10572: Removed three "no longer supported in solrconfig.xml" asserts.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a96f3944
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a96f3944
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a96f3944
Branch: refs/heads/jira/solr-10233
Commit: a96f39449b48c7c2b4f2a82c808a97fb0c60ffc5
Parents: 07acc93
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu May 4 18:20:52 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri May 5 18:58:16 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/update/SolrIndexConfig.java | 12 ------------
2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a96f3944/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5aeb05b..ec4ebe2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -129,6 +129,8 @@ Other Changes
* SOLR-10310: By default, stop splitting on whitespace prior to analysis
in edismax and standard/"lucene" query parsers. (Steve Rowe)
+* SOLR-10572: Removed three "no longer supported in solrconfig.xml" asserts. (Christine Poerschke)
+
================== 6.6.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a96f3944/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 d484e85..d7635f2 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
@@ -127,18 +127,6 @@ public class SolrIndexConfig implements MapSerializable {
luceneVersion = solrConfig.luceneMatchVersion;
- // Assert that end-of-life parameters or syntax is not in our config.
- // Warn for luceneMatchVersion's before LUCENE_3_6, fail fast above
- 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);
-
effectiveUseCompoundFileSetting = solrConfig.getBool(prefix+"/useCompoundFile", def.getUseCompoundFile());
maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs);
maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs);