Merge 2.13 into main #8943
Closed
Merge 2.13 into main #8943
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…8611) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
XXX was merged and we will include it in a future patch release since it's only with low severity. But adding a changelog entry now so we don't forget later on Signed-off-by: Dimitar Dimitrov <[email protected]>
…#8717) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
| @@ -275,6 +275,7 @@ | |||
| * [BUGFIX] Alertmanager: Fix per-tenant silence limits not reloaded during runtime. #8456 | |||
| * [BUGFIX] Alertmanager: Fix help message for utf-8-strict-mode. #8572 | |||
| * [BUGFIX] Upgrade golang to 1.22.5 to address [CVE-2024-24791](https://nvd.nist.gov/vuln/detail/CVE-2024-24791). #8600 | |||
| * [BUGFIX] Upgrade github.com/rs/cors to v1.11.0 address [GHSA-mh55-gqvf-xfwm](https://github.com/advisories/GHSA-mh55-gqvf-xfwm). #8611 | |||
There was a problem hiding this comment.
but this would be wrong - 2.13 doesn't include this fix. The PR was merged into the 2.13 branch but we didn't do a patch release
dimitarvdimitrov
dismissed
their stale review
not sure we should do this merge just yet
|
The CHANGELOG has just been cut to prepare for the next release. Please rebase |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was checking back on an update and noticed this merge had not been done.