@@ -20,9 +20,11 @@ it to the upstream repository.
20
20
[ supply a custom poll interval] ( /otto-de/solr/tree/feature/replica-custom-poll-interval )
21
21
in the ` updateHandler ` . This is of interest for TLOG/PULL replica setups with longer commit
22
22
intervals.
23
- * ✨ [ SOLR-17334] ( https://issues. apache.org/jira/browse/SOLR-17334 ) Minor bugs in Solr
23
+ * ✨ [ SOLR-17334] ( https://github.com/ apache/solr/pull/2527 ) Minor bugs in Solr
24
24
dedicated coordinator mode. Fix access to the root resource and allow coordinator
25
25
requests outside of the ` /select ` handler
26
+ * ✨ [ SOLR-17337] ( https://github.com/apache/solr/pull/2526 ) Show proper
27
+ distributed stage id
26
28
27
29
#### Pending fixes
28
30
@@ -112,19 +114,19 @@ sdk use java 11.0.21-tem
112
114
### 🔁 Releasing a new patch level version
113
115
114
116
If you want to release a new bugfix version of a already existing Solr release
115
- (say ` 9.5 .0-otto-de.2 ` over ` 9.5 .0-otto-de.1 ` ), follow these steps.
117
+ (say ` 9.6 .0-otto-de.2 ` over ` 9.6 .0-otto-de.1 ` ), follow these steps.
116
118
117
- 1 . Locate the current release candidate branch. For Solr ` 9.5 .x `
118
- this would be ` candidate/branch_9_5 `
119
- 1 . Sync the Apache Solr release branch ` branch_9_5 ` using the GitHub UI
119
+ 1 . Locate the current release candidate branch. For Solr ` 9.6 .x `
120
+ this would be ` candidates/branch_9_6 `
121
+ 1 . Sync the Apache Solr release branch ` branch_9_6 ` using the GitHub UI
120
122
1 . Rebase our release candidate branch onto the Apache Solr release
121
123
branch and replay all Cherry Pick Commits. Force push our
122
124
release candidate branch to GitHub
123
125
124
126
``` bash
125
- git checkout candidates/branch_9_5
126
- git rebase branch_9_5 --reapply-cherry-picks
127
- git push origin candidates/branch_9_5 --force
127
+ git checkout candidates/branch_9_6
128
+ git rebase branch_9_6 --reapply-cherry-picks
129
+ git push origin candidates/branch_9_6 --force
128
130
```
129
131
130
132
4 . Now cherry pick the new features/issues onto the candidate branch
@@ -184,6 +186,12 @@ $ git cherry-pick 394fab8611d25f2568a86a11d584ee77af656907
184
186
185
187
# [SOLR-16497]
186
188
$ git cherry-pick 444e8eec26e45e7f5a128d97282cf4ffc47e8898
189
+
190
+ # [SOLR-17334]
191
+ $ git cherry-pick 57affd329770bdd7c2205e848ab23994750fe79d
192
+
193
+ # [SOLR-17337]
194
+ $ git cherry-pick 0a1bfd7cccd4640a1e1e6ca51982bf8042157cd8
187
195
```
188
196
189
197
5 . __ Push your changes to the candidate branch__ and
0 commit comments