[solr] 01/01: Merge branch 'main' into Willdotwhite-bugfix/solr-inconsistent-collection-names

[ep...@apache.org]

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

epugh pushed a commit to branch Willdotwhite-bugfix/solr-inconsistent-collection-names
in repository https://gitbox.apache.org/repos/asf/solr.git

commit 2ea8c3f38378ea1358df47abe6febacc0f65e999
Merge: 2504d11101d 3e10f8b8901
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Wed Jun 21 10:38:15 2023 -0400

    Merge branch 'main' into Willdotwhite-bugfix/solr-inconsistent-collection-names

 solr/CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc solr/CHANGES.txt
index e496d71f78e,0db629d08f5..e0af7d10823
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -148,7 -148,7 +148,7 @@@ Improvement
  
  * SOLR-16687: Add support of SolrClassLoader to SolrZkClient (Lamine Idjeraoui via Jason Gerlowski & Houston Putman)
  
--* SOLR-9378: Internal shard requests no longer include the wasteful shard.url param.  [shard] transformer now defaults to returning 
++* SOLR-9378: Internal shard requests no longer include the wasteful shard.url param.  [shard] transformer now defaults to returning
    only the shard id (based on luceneMatchVersion), but can be configured to return the legacy list of replicas. (hossman)
  
  * SOLR-16816: Update node metrics while making affinityPlacement selections. Therefore selections can be made given the expected cluster