You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@solr.apache.org by ep...@apache.org on 2024/05/22 20:29:20 UTC

(solr) 01/01: Merge branch 'main' into pr/2449

This is an automated email from the ASF dual-hosted git repository.

epugh pushed a commit to branch pr/2449
in repository https://gitbox.apache.org/repos/asf/solr.git

commit 170780b7da1a524a40e4074eefd08d91fe10e513
Merge: 15dcf7cff5c 3837eebcd73
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Wed May 22 16:29:11 2024 -0400

    Merge branch 'main' into pr/2449

 solr/CHANGES.txt                                   |  14 +++
 .../java/org/apache/solr/handler/IndexFetcher.java |   2 -
 .../solr/handler/component/QueryComponent.java     |  32 ------
 .../apache/solr/search/ReRankQParserPlugin.java    |  63 +++++++----
 .../java/org/apache/solr/search/ReRankScaler.java  |  19 +++-
 .../apache/solr/cloud/RecoveryZkTestWithAuth.java  | 121 ++++++++++++++++++++
 .../solr/search/DistributedReRankExplainTest.java  | 123 +++++++++++++++------
 .../solr/search/TestReRankQParserPlugin.java       |  12 +-
 .../pages/system-requirements.adoc                 |   2 +-
 .../solrj/impl/ZkClientClusterStateProvider.java   |  17 +--
 .../solr/client/solrj/impl/Http2SolrClient.java    |  19 ++--
 .../solr/client/solrj/impl/HttpJdkSolrClient.java  |  20 ++--
 .../client/solrj/impl/Http2SolrClientTest.java     |   8 +-
 .../client/solrj/impl/HttpJdkSolrClientTest.java   |   6 +-
 .../client/solrj/impl/HttpSolrClientTestBase.java  |  33 ++++--
 15 files changed, 342 insertions(+), 149 deletions(-)