summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2021-11-18 15:34:54 +0300
committerMichael Klishin <michael@clojurewerkz.org>2021-11-18 15:34:54 +0300
commit885a22d89d7994ed02d61761d2f94ec34942ce22 (patch)
treeb9cc16fad105f8957ae8e63bd7741b89c9106405
parent77d8b6a9e8da5fe7b5eb3ab7f2c3b38fc391abff (diff)
downloadrabbitmq-server-git-885a22d89d7994ed02d61761d2f94ec34942ce22.tar.gz
Resolve release note conflictsv3.8.26
-rw-r--r--release-notes/3.8.25.md9
-rw-r--r--release-notes/3.8.26.md10
2 files changed, 10 insertions, 9 deletions
diff --git a/release-notes/3.8.25.md b/release-notes/3.8.25.md
index 6476e3667e..892f35bfe1 100644
--- a/release-notes/3.8.25.md
+++ b/release-notes/3.8.25.md
@@ -54,15 +54,6 @@ consistent release schedule.
GitHub issue: [#2653](https://github.com/rabbitmq/rabbitmq-server/pull/2653)
-### OAuth 2 Plugin
-
-#### Bug Fixes
-
- * Signing keys specified in `rabbitmq.conf` were not translated correctly,
- resulting in exceptions during permission checks.
-
- GitHub issue: [#3759](https://github.com/rabbitmq/rabbitmq-server/pull/3759)
-
## Dependency Upgrades
diff --git a/release-notes/3.8.26.md b/release-notes/3.8.26.md
index 70d5c96a1d..856da8d048 100644
--- a/release-notes/3.8.26.md
+++ b/release-notes/3.8.26.md
@@ -41,6 +41,16 @@ Contributors are encouraged to update them together with their changes. This he
consistent release schedule.
+### OAuth 2 Plugin
+
+#### Bug Fixes
+
+ * Signing keys specified in `rabbitmq.conf` were not translated correctly,
+ resulting in exceptions during permission checks.
+
+ GitHub issue: [#3759](https://github.com/rabbitmq/rabbitmq-server/pull/3759)
+
+
## Dependency Upgrades
None in this release.