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

Add changelog for v1.6.0 #3327

Merged
merged 3 commits into from
May 30, 2024
Merged

Conversation

simonswine
Copy link
Contributor

No description provided.

@simonswine simonswine marked this pull request as ready for review May 30, 2024 15:30
@simonswine simonswine requested review from a team as code owners May 30, 2024 15:30
@simonswine simonswine added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch labels May 30, 2024
Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

@knylander-grafana knylander-grafana left a comment

Choose a reason for hiding this comment

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

Thank you for creating release notes!

@aleks-p aleks-p merged commit 283b7c4 into grafana:main May 30, 2024
16 checks passed
github-actions bot pushed a commit that referenced this pull request May 30, 2024
* Add changelog for v1.6.0

* Update docs/sources/release-notes/v1-6.md

---------

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
(cherry picked from commit 283b7c4)
Copy link
Contributor

The backport to release/v1.6 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AczmP'."

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3327-to-release/v1.6 origin/release/v1.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 283b7c4f031ff8288a02ff44acc1f7d80fed7f35

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3327-to-release/v1.6
# Create the PR on GitHub
gh pr create --title '[release/v1.6] Add changelog for v1.6.0' --body 'Backport 283b7c4f031ff8288a02ff44acc1f7d80fed7f35 from #3327' --label 'type/docs' --label 'backport' --base release/v1.6 --milestone release/v1.6 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3327-to-release/v1.6

# Create a pull request where the `base` branch is `release/v1.6` and the `compare`/`head` branch is `backport-3327-to-release/v1.6`.

# Remove the local backport branch
git switch main
git branch -D backport-3327-to-release/v1.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch backport-failed type/docs Improvements for doc docs. Used by Docs team for project management
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants