Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CHANGELOG.md #8526

Merged
merged 2 commits into from
Jun 26, 2024
Merged

Update CHANGELOG.md #8526

merged 2 commits into from
Jun 26, 2024

Conversation

grobinson-grafana
Copy link
Contributor

@grobinson-grafana grobinson-grafana commented Jun 26, 2024

This commit updates the CHANGELOG as I forgot to do it in #8456.

What this PR does

Which issue(s) this PR fixes or relates to

Fixes #

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

This commit updates the CHANGELOG as I forgot to do it in #8456.
@grobinson-grafana grobinson-grafana enabled auto-merge (squash) June 26, 2024 08:26
Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move [BUGFIX] to the end of unreleased Grafana Mimir section.

@grobinson-grafana grobinson-grafana enabled auto-merge (squash) June 26, 2024 08:37
@grobinson-grafana grobinson-grafana merged commit 36f7af3 into main Jun 26, 2024
29 checks passed
@grobinson-grafana grobinson-grafana deleted the grobinson/update-changelog branch June 26, 2024 09:18
dimitarvdimitrov pushed a commit that referenced this pull request Jul 2, 2024
(cherry picked from commit 36f7af3)
dimitarvdimitrov added a commit that referenced this pull request Jul 2, 2024
* Fixes a number of bugs in silences (#8525)

This commit fixes the following bugs in silences:

- prometheus/alertmanager#3877
- prometheus/alertmanager#3898
- prometheus/alertmanager#3897

which could cause an existing silence to be deleted/expired
when updating the silence failed. This could be because
the replacing silence exceeded limits or was invalid.

(cherry picked from commit 1cfb657)

* Update CHANGELOG.md (#8526)

(cherry picked from commit 36f7af3)

---------

Co-authored-by: George Robinson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants