Merge "Merge branch 'stable-2.12'"

2016-02-11 08:56:34 +00:00
parent 437e46ea7d 557ec3c776
commit 2f39745161
33 changed files with 726 additions and 113 deletions
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -230,7 +230,7 @@ public class LuceneChangeIndex implements ChangeIndex {
            CUSTOM_CHAR_MAPPING);
    queryBuilder = new QueryBuilder(analyzer);

-    BooleanQuery.setMaxClauseCount(cfg.getInt("index", "defaultMaxClauseCount",
+    BooleanQuery.setMaxClauseCount(cfg.getInt("index", "maxTerms",
        BooleanQuery.getMaxClauseCount()));

    GerritIndexWriterConfig openConfig =