diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-11-18 15:34:20 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-11-18 15:34:20 +0300 |
| commit | b9c7aa87090a70a0f250f0c3544240b7dee8df0f (patch) | |
| tree | c3b1f69551d512c9e78fec5c6b5cad84b31eb248 | |
| parent | 7d497d5bb4355635c65821c2d1930e7ade2c45e4 (diff) | |
| download | rabbitmq-server-git-b9c7aa87090a70a0f250f0c3544240b7dee8df0f.tar.gz | |
Resolve 3.8 release note conflicts
| -rw-r--r-- | release-notes/3.8.25.md | 21 | ||||
| -rw-r--r-- | release-notes/3.8.26.md | 11 |
2 files changed, 19 insertions, 13 deletions
diff --git a/release-notes/3.8.25.md b/release-notes/3.8.25.md index fe3dfa2571..892f35bfe1 100644 --- a/release-notes/3.8.25.md +++ b/release-notes/3.8.25.md @@ -41,23 +41,18 @@ Contributors are encouraged to update them together with their changes. This he consistent release schedule. -### OAuth 2 Plugin +### Prometheus Plugin -#### Bug Fixes +#### Enhancements - * Signing keys specified in `rabbitmq.conf` were not translated correctly, - resulting in exceptions during permission checks. + * New Prometheus metrics for alarms: + * `rabbitmq_alarms_file_descriptor_limit` 1|0 + * `rabbitmq_alarms_free_disk_space_watermark` 1|0 + * `rabbitmq_alarms_memory_used_watermark` 1|0 - GitHub issue: [#3759](https://github.com/rabbitmq/rabbitmq-server/pull/3759) + While some of the alarms have cluster-wide effect, these metrics are node-local. -### 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) + GitHub issue: [#2653](https://github.com/rabbitmq/rabbitmq-server/pull/2653) ## Dependency Upgrades diff --git a/release-notes/3.8.26.md b/release-notes/3.8.26.md index 70d5c96a1d..eadaf7cae8 100644 --- a/release-notes/3.8.26.md +++ b/release-notes/3.8.26.md @@ -41,6 +41,17 @@ 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. |