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

Merge3.4 #3739

Merged
merged 31 commits into from Oct 12, 2017

Conversation

Projects
None yet
6 participants
@liujisi
Contributor

liujisi commented Oct 11, 2017

No description provided.

liujisi and others added some commits Aug 23, 2017

Merge pull request #3555 from pherl/fixdist
Make distcheck aware of test proto files.
Merge pull request #3556 from matt-kwong/kokoro_mac_v3
Remove pre-installed softwares
Merge pull request #3565 from pherl/fixdist
Add mising cmake files in dist
Merge pull request #3596 from jtattermusch/csharp_target_net45
Google.Protobuf should target net45 (and not net451)
Fix js conformance tests. (#3604)
* Fix js conformance tests.

* Remove old incorrect compatibility tests
Move parse frame array to the Map object
This makes the frame stack per-parser, and per-thread.  Fixes #3250
Merge pull request #3634 from TeBoring/ruby-bug
Cherry pick bug fix for ruby
Merge pull request #3642 from pherl/3.4.x
Bump version for minor release
Merge pull request #3612 from TeBoring/php-bug
Add prefix to php reserved keywords.
Merge pull request #3651 from pherl/3.4.x
Bumping minor version for ruby gems
Merge pull request #3691 from pherl/stringback
Fix C++11 string accessors
Merge pull request #3690 from pherl/3.4.x
Remove ranged based for in io_win32.cc

@liujisi liujisi requested a review from TeBoring Oct 11, 2017

@googlebot

This comment has been minimized.

Show comment
Hide comment
@googlebot

googlebot Oct 11, 2017

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this State. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

googlebot commented Oct 11, 2017

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this State. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@googlebot googlebot added the cla: no label Oct 11, 2017

@@ -650,6 +650,9 @@ php_EXTRA_DIST= \
php/src/Google/Protobuf/Internal/EnumOptions.php \
php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php \
php/src/Google/Protobuf/Internal/EnumValueOptions.php \
php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php \
php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php \
php/src/Google/Protobuf/Internal/FieldDescriptorProto.php \

This comment has been minimized.

@TeBoring

TeBoring Oct 11, 2017

Contributor

You probably also need to add new files after running generate_descriptor_proto

@TeBoring

TeBoring Oct 11, 2017

Contributor

You probably also need to add new files after running generate_descriptor_proto

This comment has been minimized.

@liujisi

liujisi Oct 11, 2017

Contributor

Good catch. The distcheck tests will probably catch other new files if there are any.

@liujisi

liujisi Oct 11, 2017

Contributor

Good catch. The distcheck tests will probably catch other new files if there are any.

@liujisi liujisi merged commit a632f0d into protocolbuffers:master Oct 12, 2017

22 of 23 checks passed

MacOS JRuby (Allowed Failure) Kokoro build finished
Details
Jenkins Build finished.
Details
Jenkins 32bit Build finished.
Details
Linux C# Kokoro build finished
Details
Linux C++ Distcheck Kokoro build finished
Details
Linux Java Compatibility Kokoro build finished
Details
Linux Python Compatibility Kokoro build finished
Details
MacOS C++ Kokoro build finished
Details
MacOS C++ Distcheck Kokoro build finished
Details
MacOS JavaScript Kokoro build finished
Details
MacOS Obj-C CocoaPods Integration Kokoro build finished
Details
MacOS Obj-C OS X Kokoro build finished
Details
MacOS Obj-C iOS Debug (Allowed Failure) Kokoro build finished
Details
MacOS Obj-C iOS Release (Allowed Failure) Kokoro build finished
Details
MacOS PHP5.6 Kokoro build finished
Details
MacOS PHP7.0 Kokoro build finished
Details
MacOS Python Kokoro build finished
Details
MacOS Python C++ (Allowed Failure) Kokoro build finished
Details
MacOS Ruby 2.1 Kokoro build finished
Details
MacOS Ruby 2.2 (Allowed Failure) Kokoro build finished
Details
ci.bazel.io - protobuf Build finished.
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment