Resolve 3.8 release note conflicts

This commit is contained in:
Michael Klishin 2021-11-18 15:34:20 +03:00
parent 7d497d5bb4
commit b9c7aa8709
No known key found for this signature in database
GPG Key ID: E80EDCFA0CDB21EE
2 changed files with 19 additions and 13 deletions

View File

@ -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

View File

@ -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.