This is an automated email from the ASF dual-hosted git repository. gerlowskija pushed a commit to branch branch_10_0 in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4995c1510b4799ddb12439974885351a2e9a5174 Author: Jason Gerlowski <[email protected]> AuthorDate: Thu Jan 8 09:53:11 2026 -0500 Logchange release on branch_9_10 - rm changelog/unreleased This involved a few conflicts when forward-porting from branch_9_10. A handful of changelog files had already been put into `changelog/v10.0.0/`. But with a 9.10.1 release on its way these features will now be available to users prior to 10.0. As a result, these conflicts were handled on 'main' by deleting the files out of `changelog/v10.0.0`. --- changelog/v10.0.0/PR#3603-update-log4j.yml | 9 --------- changelog/v10.0.0/PR#3926-tika-server-idle-timeout-fix.yml | 9 --------- changelog/v10.0.0/SOLR-17985-fix-slow-no-rows-queries.yml | 10 ---------- ...-Fix reverse dist sorting on LatLonPointSpatialField.yml | 13 ------------- ...7983-parallel-http-shard-handler-failure-propagation.yml | 7 ------- 5 files changed, 48 deletions(-) diff --git a/changelog/v10.0.0/PR#3603-update-log4j.yml b/changelog/v10.0.0/PR#3603-update-log4j.yml deleted file mode 100644 index 1b238ee3588..00000000000 --- a/changelog/v10.0.0/PR#3603-update-log4j.yml +++ /dev/null @@ -1,9 +0,0 @@ -# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc -title: Upgrade Log4j to 2.25.3 -type: dependency_update -authors: - - name: Piotr P. Karwasz - nick: ppkarwasz - url: https://home.apache.org/phonebook.html?uid=pkarwasz -merge_requests: - - 3603 diff --git a/changelog/v10.0.0/PR#3926-tika-server-idle-timeout-fix.yml b/changelog/v10.0.0/PR#3926-tika-server-idle-timeout-fix.yml deleted file mode 100644 index f114e4d21e3..00000000000 --- a/changelog/v10.0.0/PR#3926-tika-server-idle-timeout-fix.yml +++ /dev/null @@ -1,9 +0,0 @@ -# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc -title: When using SolrCell with TikaServer, the connection will no longer timeout after 30s idle, such as during OCR processing -type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other -authors: - - name: Jan Høydahl - url: https://home.apache.org/phonebook.html?uid=janhoy -links: - - name: PR#3926 - url: https://github.com/apache/solr/pull/3926 diff --git a/changelog/v10.0.0/SOLR-17985-fix-slow-no-rows-queries.yml b/changelog/v10.0.0/SOLR-17985-fix-slow-no-rows-queries.yml deleted file mode 100644 index f7d5f2cee52..00000000000 --- a/changelog/v10.0.0/SOLR-17985-fix-slow-no-rows-queries.yml +++ /dev/null @@ -1,10 +0,0 @@ -# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc -title: Make distributed no-rows queries fast again -type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other -authors: - - name: Houston Putman - nick: HoustonPutman - url: https://home.apache.org/phonebook.html?uid=houston -links: - - name: SOLR-17985 - url: https://issues.apache.org/jira/browse/SOLR-17985 diff --git a/changelog/v10.0.0/SOLR-18006-Fix reverse dist sorting on LatLonPointSpatialField.yml b/changelog/v10.0.0/SOLR-18006-Fix reverse dist sorting on LatLonPointSpatialField.yml deleted file mode 100644 index 3af69caac4a..00000000000 --- a/changelog/v10.0.0/SOLR-18006-Fix reverse dist sorting on LatLonPointSpatialField.yml +++ /dev/null @@ -1,13 +0,0 @@ -title: Fix reverse distance sorting on LatLonPointSpatialField and "SRPT" fields when combined with the filter cache. This is a regression since Solr 9.9. -type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other -authors: - - name: Jan Høydahl - url: https://home.apache.org/phonebook.html?uid=janhoy - - name: Umut Saribiyik - nick: umut-sar - - name: David Smiley -links: - - name: SOLR-18006 - url: https://issues.apache.org/jira/browse/SOLR-18006 - - name: SOLR-18016 - url: https://issues.apache.org/jira/browse/SOLR-18016 diff --git a/changelog/v10.0.0/solr-17983-parallel-http-shard-handler-failure-propagation.yml b/changelog/v10.0.0/solr-17983-parallel-http-shard-handler-failure-propagation.yml deleted file mode 100644 index 1c19e9e0bbc..00000000000 --- a/changelog/v10.0.0/solr-17983-parallel-http-shard-handler-failure-propagation.yml +++ /dev/null @@ -1,7 +0,0 @@ -title: Ensure ParallelHttpShardHandler records submit failures so distributed requests don’t hang -type: fixed -authors: - - name: Mark Miller -links: - - name: SOLR-17983 - url: https://issues.apache.org/jira/browse/SOLR-17983
