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

Move change log entry of 6106 into helm changelog #6769

Merged
merged 1 commit into from
Dec 4, 2023

Conversation

dimitarvdimitrov
Copy link
Contributor

Follow-up of #6106

This also adds a bit more details for how to use the feature.

@leizor
Copy link
Contributor

leizor commented Nov 28, 2023

The CHANGELOG has just been cut to prepare for the next Mimir release. Please rebase main and eventually move the CHANGELOG entry added / updated in this PR to the top of the CHANGELOG document. Thanks!

This also adds a bit more details for how to use the feature.

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
@dimitarvdimitrov dimitarvdimitrov enabled auto-merge (squash) December 4, 2023 10:29
@dimitarvdimitrov dimitarvdimitrov merged commit f52486a into main Dec 4, 2023
32 checks passed
@dimitarvdimitrov dimitarvdimitrov deleted the dimitar/helm/update-6106-changelo branch December 4, 2023 14:21
grafanabot pushed a commit that referenced this pull request Dec 4, 2023
This also adds a bit more details for how to use the feature.

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

The backport to r266 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-6769-to-r266 origin/r266
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x f52486afa73c97a5dca1768f58738256775afd32
# Push it to GitHub
git push --set-upstream origin backport-6769-to-r266
git switch main
# Remove the local backport branch
git branch -D backport-6769-to-r266

Then, create a pull request where the base branch is r266 and the compare/head branch is backport-6769-to-r266.

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.

None yet

4 participants