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

Integrated internal changes from Google #3988

Merged
merged 5 commits into from Dec 5, 2017

Conversation

Projects
None yet
3 participants
@acozzette
Contributor

acozzette commented Dec 1, 2017

No description provided.

@googlebot googlebot added the cla: yes label Dec 1, 2017

@acozzette

This comment has been minimized.

Show comment
Hide comment
@acozzette

acozzette Dec 4, 2017

Contributor

retest this please

Contributor

acozzette commented Dec 4, 2017

retest this please

1 similar comment
@acozzette

This comment has been minimized.

Show comment
Hide comment
@acozzette

acozzette Dec 4, 2017

Contributor

retest this please

Contributor

acozzette commented Dec 4, 2017

retest this please

@acozzette acozzette requested a review from xfxyjwf Dec 5, 2017

Show outdated Hide outdated js/commonjs/export_testdeps.js Outdated
Show outdated Hide outdated js/message_test.js Outdated
@xfxyjwf

xfxyjwf approved these changes Dec 5, 2017

@acozzette

This comment has been minimized.

Show comment
Hide comment
@acozzette

acozzette Dec 5, 2017

Contributor

Thanks, @xfxyjwf! I'll merge this now without waiting for Travis, since this includes only a trivial change since the previous successful Travis run.

Contributor

acozzette commented Dec 5, 2017

Thanks, @xfxyjwf! I'll merge this now without waiting for Travis, since this includes only a trivial change since the previous successful Travis run.

@acozzette acozzette merged commit 9021f62 into protocolbuffers:master Dec 5, 2017

21 of 23 checks passed

MacOS JRuby (Allowed Failure) Kokoro build finished
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
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
cla/google All necessary CLAs are signed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@acozzette acozzette deleted the acozzette:down-integrate branch Dec 5, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment