Roll forward #22998 #23093
Merged
Roll forward #22998 #23093
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
stanley-cheung
added
priority/P0/RELEASE BLOCKER
area/protoc plugins
release notes: no
stanley-cheung
requested review from
apolcyn,
gnossen,
jtattermusch,
nicolasnoble and
veblush
as code owners
srini100
approved these changes
May 29, 2020
|
@srini100 sure will do an import. Please let me know before the release branch is cut. |
stanley-cheung
force-pushed
the
roll-forward-22998
branch
from
47a7cf2
to
6f72faa
Compare
jtattermusch
approved these changes
Jun 1, 2020
|
There's an ongoing internal protobuf CL to change the signature to |
|
Internal Protobuf CL submitted. I am running a test grpc import with cherry-picking this PR... |
|
The test import cherry-picking this PR all passed internal presubmits. Merging this now. |
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.
This is to roll forward #22998 after the rollback in #23089
We needed to roll #22998 back because of this import error: https://g3c.corp.google.com/results/invocations/c787c170-933c-4d84-88db-908739d593c1/targets/%2F%2Fgooglex%2Fdaedalus%2Fembedded%2Fbase%2Fnet%2Fngrpc2%2Fclient:channel_test/log
Apparently the protobuf spec told us to use
uint64_tbut internal is usinguint64.I checked with the protobuf team and they said that
uint64_tshould be the correct one. Waiting for them to fix this on their side and then I will merge this again.This needs to go into the next 1.30 release.