[release/2.2] bump google.golang.org/grpc from 1.76.0 to 1.78.0#12739
Merged
kzys merged 2 commits intocontainerd:release/2.2from Jan 7, 2026
Merged
[release/2.2] bump google.golang.org/grpc from 1.76.0 to 1.78.0#12739kzys merged 2 commits intocontainerd:release/2.2from
kzys merged 2 commits intocontainerd:release/2.2from
Conversation
4d5bc07 to
bfc4032
Compare
Contributor
Author
|
done @djdongjin |
Member
|
Can you do a cherry pick of #12530 and #12736. I think that should apply clean. |
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.76.0 to 1.77.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.76.0...v1.77.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.77.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> (cherry picked from commit fb92a97) Signed-off-by: ningmingxiao <[email protected]>
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.77.0 to 1.78.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.77.0...v1.78.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-version: 1.78.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> (cherry picked from commit e7ba3c3) Signed-off-by: ningmingxiao <[email protected]>
bfc4032 to
533a255
Compare
Contributor
Author
|
done @akhilerm |
Member
Was this a clean cherry pick or some changes were made in the go.mod file? I see a difference in the patch id for the commits. |
Contributor
Author
|
it's not a clean cherry pick, to fix conflict I add some change in go.mod. @akhilerm |
akhilerm
approved these changes
Jan 6, 2026
kzys
approved these changes
Jan 6, 2026
Member
|
is it possible to squash them into one commit? just upgrade from 1.76 to 1.78... |
Contributor
Author
Member
@fuweid I wanted to have a trace of the original commits that were used for the update. |
fuweid
approved these changes
Jan 7, 2026
kzys
approved these changes
Jan 7, 2026
This file contains hidden or 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
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.
fix: #12738