tempo-query: register gRPC health server #4178
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
frzifus
requested review from
joe-elliott,
annanay25,
mdisibio,
mapno,
yvrhdn,
zalegrala,
electron0zero,
ie-pham,
stoewer and
javiermolinar
as code owners
frzifus
force-pushed
the
tempo-query/register_health_server
branch
from
3717794 to
eafcfcd
Compare
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
frzifus
force-pushed
the
tempo-query/register_health_server
branch
from
eafcfcd to
726a563
Compare
|
Resolved it :) |
|
This PR must be merged before a backport PR will be created. |
javiermolinar
approved these changes
Oct 15, 2024
|
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-4178-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 4726342c60d6ad873f1d279effbabf732cd2ea52When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-4178-to-release-v2.6
# Create the PR body template
PR_BODY=$(gh pr view 4178 --json body --template 'Backport 4726342c60d6ad873f1d279effbabf732cd2ea52 from #4178{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.6] tempo-query: register gRPC health server' --body-file - --label 'type/bug' --label 'backport' --base release-v2.6 --milestone release-v2.6 --webOr, 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-4178-to-release-v2.6
# Create a pull request where the `base` branch is `release-v2.6` and the `compare`/`head` branch is `backport-4178-to-release-v2.6`.
# Remove the local backport branch
git switch main
git branch -D backport-4178-to-release-v2.6 |
joe-elliott
pushed a commit
that referenced
this pull request
Oct 15, 2024
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> Co-authored-by: Joe Elliott <number101010@gmail.com> (cherry picked from commit 4726342)
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:
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]