[DOC] Fix Tempo version in Linux doc #2574
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
knylander-grafana
requested review from
joe-elliott,
annanay25,
mdisibio,
mapno,
kvrhdn,
zalegrala,
electron0zero,
ie-pham and
stoewer
as code owners
knylander-grafana
changed the title
ie-pham
approved these changes
Jun 20, 2023
github-actions bot
pushed a commit
that referenced
this pull request
Jun 20, 2023
* Fix Tempo version in Linux doc * Apply suggestions from code review (cherry picked from commit 1a69c72)
3 tasks
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2574-to-release-v2.1 origin/release-v2.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 1a69c724cf949b5d587d777bfceb5c3bf871999d
# 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 and a PR:
gh pr create --title "[release-v2.1] [DOC] Fix Tempo version in Linux doc" --body "Backport 1a69c724cf949b5d587d777bfceb5c3bf871999d from #2574" --label backport --base release-v2.1 --milestone release-v2.1 --web
# If you don't have the GitHub CLI installed: Push the branch to GitHub and manually create a PR:
git push --set-upstream origin backport-2574-to-release-v2.1
# Remove the local backport branch
git switch main
git branch -D backport-2574-to-release-v2.1Unless you've used the GitHub CLI above, now create a pull request where the |
knylander-grafana
added a commit
that referenced
this pull request
Jun 20, 2023
* Fix Tempo version in Linux doc * Apply suggestions from code review (cherry picked from commit 1a69c72) Co-authored-by: Kim Nylander <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
Corrects the version of Tempo called in the Linux set up guide from 1.5 to 2.1.1.
Which issue(s) this PR fixes:
Fixes #2572
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]