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 2019/04/15 18:40:57 UTC
[lucene-solr] 02/02: Merge remote-tracking branch
'refs/remotes/origin/branch_8x' into branch_8x
This is an automated email from the ASF dual-hosted git repository.
hossman pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 4c9311e8bfb4d59f9c69fc78388c3070fc481a21
Merge: 59a3c45 fe37e18
Author: Chris Hostetter <ho...@apache.org>
AuthorDate: Mon Apr 15 11:40:42 2019 -0700
Merge remote-tracking branch 'refs/remotes/origin/branch_8x' into branch_8x
Conflicts:
solr/CHANGES.txt
solr/CHANGES.txt | 5 +++++
.../src/java/org/apache/solr/cloud/OverseerTaskProcessor.java | 9 +++++++++
solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java | 6 ++++--
3 files changed, 18 insertions(+), 2 deletions(-)
diff --cc solr/CHANGES.txt
index 5adf8cb,56ae67b..9843245
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -160,9 -152,10 +160,14 @@@ Bug Fixe
processing concurrent requests during shutdown. This primarily affected tests, but may have also caused
odd errors/delays when restart/shutting down solr nodes. (hossman)
+* SOLR-13336: add maxBooleanClauses (default to 1024) setting to solr.xml, reverting previous effective
+ value of Integer.MAX_VALUE-1, to restrict risk of pathalogical query expansion. (hossman)
+
+ * SOLR-13386: OverseerTaskQueue#remove should not throw an exception when no node exists after an exists
+ check and the Overseer work loop should not allow free spinning the loop when it hits a KeeperException.
+ (Mark Miller, Fernandez-Lobbe, Mike Drob)
+
++
Improvements
----------------------