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

Merge release 2.9 to main #5290

Merged
merged 6 commits into from
Jun 20, 2023
Merged

Merge release 2.9 to main #5290

merged 6 commits into from
Jun 20, 2023

Conversation

flxbk
Copy link
Contributor

@flxbk flxbk commented Jun 20, 2023

What this PR does

This merges release-2.9 back into main.

Which issue(s) this PR fixes or relates to

Related to #5112

Checklist

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

grafanabot and others added 6 commits June 19, 2023 07:56
Bumps alpine from 3.18.0 to 3.18.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit bb6f99a)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Draft release notes for Mimir 2.9.0

* make doc

* Apply review suggestion

Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com>

* Add deprecated flags, remove section for stable options/features.

* Apply Dimitar's wording suggestion

Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Add list of newly stable features

* Expand on object storage call reduction

* Update docs/sources/mimir/release-notes/v2.9.md

Co-authored-by: Felix Beuke <felix.j.beuke@gmail.com>

* make doc

* Mention changed default for `ruler.poll-interval`

* Update docs/sources/mimir/release-notes/v2.9.md

* Update v2.9.md

* Add marco's wording improvement.

Co-authored-by: Marco Pracucci <marco@pracucci.com>

* Update docs/sources/mimir/release-notes/v2.9.md

---------

Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com>
Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Co-authored-by: Marco Pracucci <marco@pracucci.com>
(cherry picked from commit a378cc6)

Co-authored-by: Felix Beuke <felix.j.beuke@gmail.com>
* Bump version to 2.9.0

* make build-jsonnet-tests
@flxbk flxbk requested a review from a team as a code owner June 20, 2023 10:48
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.

Looks good. Please don't forget to merge with merge commit, or using the ./tools/release/merge-approved-pr-branch-to-main.sh script.

@pstibrany pstibrany merged commit bbef648 into main Jun 20, 2023
@pstibrany pstibrany deleted the merge-release-2.9-to-main branch June 20, 2023 11:06
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.

3 participants