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

[DOC] Clarify Parquet requirements in 2.6 #4135

Conversation

knylander-grafana
Copy link
Contributor

@knylander-grafana knylander-grafana commented Sep 27, 2024

What this PR does:

Clarifies the vParquet4 requirements in the release notes and upgrade docs.

Redo of #4107

Which issue(s) this PR fixes:
Fixes #

Checklist

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

Copy link
Contributor

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

@knylander-grafana knylander-grafana merged commit d6a9486 into grafana:main Sep 30, 2024
17 checks passed
@knylander-grafana knylander-grafana deleted the update-rel-notes-parquet-take2 branch September 30, 2024 16:34
Copy link
Contributor

The backport to release-v2.6 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-4135-to-release-v2.6 origin/release-v2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x d6a948660590283ff39f0d15dacaa667505f13de

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-4135-to-release-v2.6
# Create the PR body template
PR_BODY=$(gh pr view 4135 --json body --template 'Backport d6a948660590283ff39f0d15dacaa667505f13de from #4135{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.6] [DOC] Clarify Parquet requirements in 2.6' --body-file - --label 'type/docs' --label 'backport' --base release-v2.6 --milestone release-v2.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-4135-to-release-v2.6

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

# Remove the local backport branch
git switch main
git branch -D backport-4135-to-release-v2.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-v2.6 backport-failed type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants