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.13 to main #10124

Merged
merged 10 commits into from
Dec 4, 2024
Merged

Merge release-2.13 to main #10124

merged 10 commits into from
Dec 4, 2024

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Dec 4, 2024

In this PR I'm merging the release-2.13 branch to main branch. Please merge this PR using a merge commit or by using tools/release/merge-approved-pr-branch-to-main.sh script.

renovate bot and others added 10 commits July 8, 2024 10:38
…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 <dimitar.dimitrov@grafana.com>
…#8717)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 673cbe2)

Co-authored-by: George Robinson <george.robinson@grafana.com>
…zation secrets (#9336)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit f4756db)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Upgrade to Go v1.22.9
* Update build image version to pr10097-2f1432e4d6

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: aknuds1 <aknuds1@users.noreply.github.com>
* Add security fix to changelog
* Bump version to 2.13.1
* Add v2.13.1 to release notes
* Update screenshots

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
…0122)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
@aknuds1 aknuds1 requested review from tacole02 and a team as code owners December 4, 2024 10:35
Copy link
Contributor

@narqo narqo left a comment

Choose a reason for hiding this comment

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

🤖

Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

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

🔥

don't forget to run the command to merge instead of clicking the shiny green button

@aknuds1 aknuds1 merged commit d557f41 into main Dec 4, 2024
29 checks passed
@aknuds1 aknuds1 deleted the merge-release-2.13-to-main branch December 4, 2024 12:54
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.

4 participants