Merge branch 3.11.x to master #7231
Merged
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
* Blacklist .proto source files is Bazel allows us to This is a partial revert of 7b28278 to unblock, e.g., grpc/grpc#21590 or envoyproxy/envoy-mobile#617 until Bazel is fixed. Note: this is a forward-compatible change that automatically switches to the behavior intended by 7b28278 when a compatible Bazel is released without requiring users to upgrade Protobuf. We will revert this change when Bazel is fixed. * Remove trailing , * Update BUILD
* Call register_class before getClass from desc * Remove debug code
Fix latest ArgumentException for C# extensions Co-authored-by: Jan Tattermusch <jtattermusch@users.noreply.github.com>
Instead of calling initOnce of dependencies, initialize metadata of dependencies in the same file. Needs to pass aggregate_metadata option to protoc to trigger, e.g.: --php_out=aggregate_metadata=foo#bar:generated_dir For each input file, transitive dependencies (including itself), whose package name has the prefix of foo or bar, will be aggregated, in which their metadata string will be aggregated in the same internalAddGeneratedFile call. For other dependencies, initOnce is called as before. This feature is EXPERIMENTAL. DO NOT USE!!!
* Add failing tests for issues with wrapped values where the value is the default * Add test for wrapped values without a value set * Bugfix for wrapper types with default values. The previous optimizations for wrapper types had a bug that prevented wrappers from registering as "present" if the "value" field was not present on the wire. In practice the "value" field will not be serialized when it is zero, according to proto3 semantics, but due to the optimization this prevented it from creating a new object to represent the presence of the field. The fix is to ensure that if the wrapper message is present on the wire, we always initialize its value to zero. Co-authored-by: Joshua Haberman <jhaberman@gmail.com> Co-authored-by: Dan Quan <dan@quan.io>
* Remove protoc release for 32-bit Macs Apple has been removing the support for 32-bit Mac apps: https://support.apple.com/en-us/HT208436 Our release infrastructure no longer supports building for 32-bit architecture. * Remove protoc artifact for MacOS 32-bit
|
All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the ℹ️ Googlers: Go here for more info. |
rafi-kamal
force-pushed
the
3.11.x-202002181624
branch
2 times, most recently
from
6a96e86
to
c18f4bb
Compare
rafi-kamal
force-pushed
the
3.11.x-202002181624
branch
from
c18f4bb
to
0eb476b
Compare
|
A Googler has manually verified that the CLAs look good. (Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.) ℹ️ Googlers: Go here for more info. |
TeBoring
approved these changes
Feb 19, 2020
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.
No description provided.