You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2014/12/11 21:45:08 UTC

svn commit: r1644759 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java

Author: hossman
Date: Thu Dec 11 20:45:07 2014
New Revision: 1644759

URL: http://svn.apache.org/r1644759
Log:
SOLR-6834: hard fail if checkIntegrityAtMerge is used in 6.0 (trunk only, not for backport)

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1644759&r1=1644758&r2=1644759&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Thu Dec 11 20:45:07 2014
@@ -173,7 +173,7 @@ public class SolrIndexConfig implements
 
     assertWarnOrFail("Begining with Solr 5.0, <checkIntegrityAtMerge> option is no longer supported and should be removed from solrconfig.xml (these integrity checks are now automatic)",
                      (null == solrConfig.getNode(prefix+"/checkIntegrityAtMerge",false)),
-                     false);
+                     true);
   }
   @Override
   public Map<String, Object> toMap() {