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 2.10 changelog and release notes #6900

Merged

Conversation

dimitarvdimitrov
Copy link
Contributor

No description provided.

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Contributor

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

LGTM, remember to backport to release-2.10 and release-2.11

@dimitarvdimitrov dimitarvdimitrov enabled auto-merge (squash) December 12, 2023 12:54
@dimitarvdimitrov dimitarvdimitrov merged commit 9bb55ff into main Dec 12, 2023
30 checks passed
@dimitarvdimitrov dimitarvdimitrov deleted the dimitar/2.10/update-changelog-and-release-notes branch December 12, 2023 13:00
grafanabot pushed a commit that referenced this pull request Dec 12, 2023
* Update 2.10 changelog and release notes

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Update CHANGELOG.md

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
(cherry picked from commit 9bb55ff)
grafanabot pushed a commit that referenced this pull request Dec 12, 2023
* Update 2.10 changelog and release notes

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

* Update CHANGELOG.md

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
(cherry picked from commit 9bb55ff)
@grafanabot
Copy link
Contributor

The backport to release-2.11 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6900-to-release-2.11 origin/release-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 9bb55ffacd9f6566ff572aca4a426ea1d20608f2
# Push it to GitHub
git push --set-upstream origin backport-6900-to-release-2.11
git switch main
# Remove the local backport branch
git branch -D backport-6900-to-release-2.11

Then, create a pull request where the base branch is release-2.11 and the compare/head branch is backport-6900-to-release-2.11.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants