You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/02/08 18:11:41 UTC
[3/5] lucene-solr git commit: temporarily change
solrconfig.snippet.randomindexconfig.xml back to using RandomMergePolicy
(instead of RandomMergePolicyFactory)
temporarily change solrconfig.snippet.randomindexconfig.xml back to using RandomMergePolicy (instead of RandomMergePolicyFactory)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/18986122
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/18986122
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/18986122
Branch: refs/heads/master-solr-8621
Commit: 189861221e9638f010b1369bd958ae2627cb11ee
Parents: 83ffada
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Feb 8 16:32:50 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Feb 8 16:32:50 2016 +0000
----------------------------------------------------------------------
.../solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18986122/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
index a23bf0a..069ccb8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
@@ -26,7 +26,7 @@ A solrconfig.xml snippet containing indexConfig settings for randomized testing.
the RandomMergePolicy in all tests - but some tests expect very specific
Merge behavior, so those tests can set it as needed.
-->
- <mergePolicyFactory class="org.apache.solr.util.RandomMergePolicyFactory" />
+ <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>