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

Bump grpc-go and x/net #50236

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Conversation

howardjohn
Copy link
Member

No description provided.

@howardjohn howardjohn added the release-notes-none Indicates a PR that does not require release notes. label Apr 3, 2024
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 3, 2024
@istio-testing istio-testing merged commit e872055 into istio:master Apr 4, 2024
29 checks passed
@bleggett bleggett added the cherrypick/release-1.21 Set this label on a PR to auto-merge it to the release-1.21 branch label Apr 4, 2024
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #50236 failed to apply on top of branch "release-1.21":

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

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #50258

bleggett pushed a commit to bleggett/istio that referenced this pull request Apr 4, 2024
bleggett pushed a commit to bleggett/istio that referenced this pull request Apr 4, 2024
istio-testing pushed a commit that referenced this pull request Apr 4, 2024
* Bump grpc-go and x/net (#50236)

(cherry picked from commit e872055)

* Bump gRPC deps (#50129)

Resolve breaking change in
grpc/grpc-go#6997.

This is a low leverl interface so I don't think its a huge concern it
broke

(cherry picked from commit 48a1921)

* Bump go-control-plane (#48841)

* Bump go-control-plane

* Bump and turn off by default

* fix gen

* bump

(cherry picked from commit faf5bdd)

---------

Co-authored-by: John Howard <howardjohn@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherrypick/release-1.21 Set this label on a PR to auto-merge it to the release-1.21 branch release-notes-none Indicates a PR that does not require release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants