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.

Sign up for GitHub

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

Jump to bottom

Bump up otelttrpc to 0.1.0 #11241

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Bump up otelttrpc to 0.1.0 #11241

merged 1 commit into from
Jan 9, 2025

Conversation

djdongjin
Copy link
Member

Fix #11138. We probably also want to backport to release/2.0

@k8s-ci-robot
Copy link

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@djdongjin
Copy link
Member Author

/test all

@djdongjin djdongjin marked this pull request as ready for review January 9, 2025 20:23
@dosubot dosubot bot added the dependencies Pull requests that update a dependency file label Jan 9, 2025
@AkihiroSuda AkihiroSuda added the cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch label Jan 9, 2025
@dmcgowan dmcgowan added this pull request to the merge queue Jan 9, 2025
Merged via the queue into containerd:main with commit 1ad1681 Jan 9, 2025
58 checks passed
@djdongjin
Copy link
Member Author

/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link

@djdongjin: #11241 failed to apply on top of branch "release/2.0":

Applying: Bump up otelttrpc to 0.1.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump up otelttrpc to 0.1.0

In response to this:

/cherry-pick release/2.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@djdongjin djdongjin mentioned this pull request Jan 9, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch dependencies Pull requests that update a dependency file size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fatal errors: TTRPC metadata concurrent map operations
5 participants
@djdongjin @k8s-ci-robot @k8s-infra-cherrypick-robot @dmcgowan @AkihiroSuda