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

Posted to commits@solr.apache.org by cp...@apache.org on 2024/02/20 18:07:47 UTC

(solr) 01/01: Merge remote-tracking branch 'origin/main' into jira/solr-13350

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

cpoerschke pushed a commit to branch jira/solr-13350
in repository https://gitbox.apache.org/repos/asf/solr.git

commit 65f9a4e561ac7cfbe71f370428bf253a5a98c110
Merge: 43be691c4f3 065d21abb42
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Tue Feb 20 18:04:39 2024 +0000

    Merge remote-tracking branch 'origin/main' into jira/solr-13350
    
    Resolved Conflicts:
            solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java