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

Merge 3.9.x 201908071359 to master #6484

Merged
merged 19 commits into from
Aug 9, 2019
Merged

Merge 3.9.x 201908071359 to master #6484

merged 19 commits into from
Aug 9, 2019

Conversation

anandolee
Copy link
Contributor

No description provided.

Hao Nguyen and others added 19 commits June 28, 2019 15:25
Add changelog for 3.9.x
35bf1ae
Merge pull request #6319 from haon4/3.9.x-201906281515
2c2267c 
Add changelog for 3.9.x
@TeBoring
Revert "Make php message class final to avoid mocking (#6277)" (#6324)
15929e1 
This reverts commit 7f84a94.
This is just temporary. Eventually, we still want to roll forward this
change. Some users are complaining they need more time to clean up their
code.
@jjinglover @acozzette
Update extract_includes.bat.in
f1ecf5c 
File io_win32.h is not in directory google\protobuf\stubs under directory google\protobuf\io
@TeBoring
Set oneof case in array constructor (#6351)
864bd03 
Forgot to set it previously.
@TeBoring
Update protobuf version (#6366)
6a59a2a
@TeBoring
Drop building wheel for python 3.4 (#6406)
79c946f 
https://github.com/matthew-brett/multibuild/pull/240
@jtattermusch @anandolee
Fix binary compatibility in FieldCodec factory methods (#6380) (#6424)
325ed81 
* Fix binary compatibility in FieldCodec factory messages

* Make default value parameter for current factories required

* Route old methods through default value overloads
@ObsidianMinor @jtattermusch
Remove ExtensionRegistry.Add(params) overload
5f2ec57
@ObsidianMinor @jtattermusch
Rename ExtensionRegistry.Add(IEnumerable<Extension>) overload to AddR…
5995d72 
…ange
@ObsidianMinor @jtattermusch
Edit naming of parameters in Extension classes
0c044c7
@ObsidianMinor @jtattermusch
* Fix add API warnings to docs for extension APIs
b99e8f5 
* Rename internal ExtensionSet.GetValue to TryGetValue
@TeBoring
Disable javadoc error (#6371)
fce3613 
* Disable javadoc error

Actual fixes of the javadoc will be followed up

* Remove duplicated configuration

* Update javadoc plugin version
@TeBoring
Updated Bazel test script to use most recent Bazel version (#6413) (#…
65ed62e 
…6433)

I'm not exactly sure why, but this fixes the failing Bazel presubmit
test. Using the most recent version seems like a good idea anyway so
that we can make sure we're compatible with any new Bazel changes.
@Yannic @acozzette
[bazel] Add fixes for --incompatible_load_{cc,java,proto}_rules_from_bzl
92f2c89
@jtattermusch
Merge pull request #6431 from jtattermusch/backport_csharp_proto2_review
bc5f088 
Backport review comments for C# proto2 features (for 3.9.x)
@TeBoring
No need to update version in generated code (#6471)
ebfde4c 
generate_descriptor will handle that
@TeBoring
Update protobuf version (#6472)
655310c
@anandolee
Merge branch '3.9.x' into 3.9.x-201908071359
dc2818c
@anandolee anandolee requested a review from TeBoring August 7, 2019 21:11
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link

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 TeBoring self-assigned this Aug 8, 2019
@anandolee anandolee merged commit 4315677 into protocolbuffers:master Aug 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeBoring TeBoring TeBoring approved these changes

Assignees

@TeBoring TeBoring

Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@anandolee @googlebot @TeBoring @protobuf-kokoro @jjinglover @jtattermusch @ObsidianMinor @Yannic