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

cherry-pick commits to 1.34.x #4229

Merged
merged 3 commits into from Mar 11, 2021
Merged

cherry-pick commits to 1.34.x #4229

merged 3 commits into from Mar 11, 2021

Conversation

menghanl
Copy link
Contributor

@menghanl menghanl commented Feb 26, 2021 •
edited

This is a cherry pick of

dfawley
dfawley approved these changes Feb 27, 2021
View reviewed changes
Copy link
Member

@dfawley dfawley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the test failure here...

@dfawley dfawley assigned menghanl and unassigned dfawley Feb 27, 2021
@menghanl menghanl force-pushed the v1.34.x branch 4 times, most recently from 864267a to ef4671f Compare March 9, 2021 18:41
@menghanl menghanl changed the title encoding/proto: do not panic when types do not match (#4218) cherry-pick commits to 1.34.x (#4218) Mar 9, 2021
@menghanl menghanl changed the title cherry-pick commits to 1.34.x (#4218) cherry-pick commits to 1.34.x Mar 9, 2021
dfawley
dfawley approved these changes Mar 9, 2021
View reviewed changes
Copy link
Member

@dfawley dfawley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. We should make the HOME/go/bin change on master, too. Should we do that in a PR then cherry-pick the commit, or does it matter?

@menghanl menghanl merged commit d6e9a49 into grpc:v1.34.x Mar 11, 2021
@menghanl menghanl deleted the v1.34.x branch March 11, 2021 22:11
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dfawley dfawley dfawley approved these changes

Assignees

@menghanl menghanl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@menghanl @dfawley @easwars