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] Correct Jaeger spelling mistake #4015

Merged

Conversation

knylander-grafana
Copy link
Contributor

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

What this PR does:

Corrects spelling from Jaegar to Jaeger.

Which issue(s) this PR fixes:
Recreates #3940

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.

2 similar comments
Copy link
Contributor

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

Copy link
Contributor

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

@electron0zero electron0zero merged commit 061b03d into grafana:main Aug 28, 2024
20 checks passed
Copy link
Contributor

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

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-4015-to-release-v2.5
# Create the PR body template
PR_BODY=$(gh pr view 4015 --json body --template 'Backport 061b03d7349728f9033b6a8a9e5f4596fcd740d7 from #4015{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.5] [DOC] Correct Jaeger spelling mistake' --body-file - --label 'type/docs' --label 'backport' --base release-v2.5 --milestone release-v2.5 --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-4015-to-release-v2.5

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

# Remove the local backport branch
git switch main
git branch -D backport-4015-to-release-v2.5

github-actions bot pushed a commit that referenced this pull request Aug 28, 2024
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.

2 participants