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.

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

Down Integrate Internal Changes #6634

Merged
merged 5 commits into from Sep 12, 2019

Conversation

@TeBoring
Copy link
Contributor

commented Sep 11, 2019

No description provided.

@TeBoring TeBoring self-assigned this Sep 11, 2019
@googlebot googlebot added the cla: yes label Sep 11, 2019
Makefile.am Outdated
@@ -348,7 +348,6 @@ java_EXTRA_DIST=
java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java \
java/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java \
java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java \
java/core/src/main/java/com/google/protobuf/TypeRegistry.java \

This comment has been minimized.

Copy link
@rafi-kamal

rafi-kamal Sep 11, 2019

Contributor

Do you know why these two files got removed? They are still available internally.

This comment has been minimized.

Copy link
@TeBoring

TeBoring Sep 12, 2019

Author Contributor

I think the up-integration doesn't properly reflect changes in github. Need to investigate during up-integration.

"google-closure-compiler": "~20190301.0.0",
"google-closure-library": "~20190301.0.0",
"gulp": "~4.0.1",
"jasmine": "~2.4.1"
},

This comment has been minimized.

Copy link
@rafi-kamal

rafi-kamal Sep 11, 2019

Contributor

This is downgrading the package dependencies (except Jasmine's).

This comment has been minimized.

Copy link
@TeBoring

TeBoring Sep 12, 2019

Author Contributor

ditto

@@ -186,7 +186,7 @@ class ZeroCopyCodedInputStream : public io::ZeroCopyInputStream {
}
void BackUp(int count) final { cis_->Advance(-count); }
bool Skip(int count) final { return cis_->Skip(count); }
int64 ByteCount() const final { return 0; }
google::protobuf::io::ByteCountInt64 ByteCount() const final { return 0; }

This comment has been minimized.

Copy link
@rafi-kamal

rafi-kamal Sep 11, 2019

Contributor

I think this should be int64_t. Can you please check with Josh?

This comment has been minimized.

Copy link
@TeBoring

TeBoring Sep 12, 2019

Author Contributor

Fixed internally

@@ -213,6 +213,7 @@ libprotobuf_lite_la_SOURCES = \
google/protobuf/repeated_field.cc \
google/protobuf/wire_format_lite.cc \
google/protobuf/io/coded_stream.cc \
google/protobuf/io/coded_stream_inl.h \

This comment has been minimized.

Copy link
@rafi-kamal

rafi-kamal Sep 11, 2019

Contributor

Are we actually using this file? I also don't see it in this commit.

This comment has been minimized.

Copy link
@TeBoring

TeBoring Sep 12, 2019

Author Contributor

ditto

@TeBoring TeBoring merged commit 763c358 into protocolbuffers:master Sep 12, 2019
56 checks passed
56 checks passed
Bazel Kokoro build successful
Details
Dist artifact installation Kokoro build successful
Details
Linux 32-bit Kokoro build successful
Details
Linux C# Kokoro build successful
Details
Linux C++ Distcheck Kokoro build successful
Details
Linux C++ TC Malloc Kokoro build successful
Details
Linux Golang Kokoro build successful
Details
Linux Java Compatibility Kokoro build successful
Details
Linux Java JDK 7 Kokoro build successful
Details
Linux Java Linkage Monitor Kokoro build successful
Details
Linux Java Oracle 7 Kokoro build successful
Details
Linux JavaScript Kokoro build successful
Details
Linux PHP Kokoro build successful
Details
Linux Python Kokoro build successful
Details
Linux Python 2.7 Kokoro build successful
Details
Linux Python 2.7 C++ Kokoro build successful
Details
Linux Python 3.3 Kokoro build successful
Details
Linux Python 3.3 C++ Kokoro build successful
Details
Linux Python 3.4 Kokoro build successful
Details
Linux Python 3.4 C++ Kokoro build successful
Details
Linux Python 3.5 Kokoro build successful
Details
Linux Python 3.5 C++ Kokoro build successful
Details
Linux Python 3.6 Kokoro build successful
Details
Linux Python 3.6 C++ Kokoro build successful
Details
Linux Python 3.7 Kokoro build successful
Details
Linux Python 3.7 C++ Kokoro build successful
Details
Linux Python C++ Kokoro build successful
Details
Linux Python Compatibility Kokoro build successful
Details
Linux Python Release Kokoro build successful
Details
Linux Ruby 2.3 Kokoro build successful
Details
Linux Ruby 2.4 Kokoro build successful
Details
Linux Ruby 2.5 Kokoro build successful
Details
Linux Ruby 2.6 Kokoro build successful
Details
Linux Ruby Release Kokoro build successful
Details
MacOS C++ Kokoro build successful
Details
MacOS C++ Distcheck Kokoro build successful
Details
MacOS JavaScript Kokoro build successful
Details
MacOS Obj-C CocoaPods Integration Kokoro build successful
Details
MacOS Obj-C OS X Kokoro build successful
Details
MacOS Obj-C iOS Debug Kokoro build successful
Details
MacOS Obj-C iOS Release Kokoro build successful
Details
MacOS PHP5.6 Kokoro build successful
Details
MacOS PHP7.0 Kokoro build successful
Details
MacOS Python Kokoro build successful
Details
MacOS Python C++ Kokoro build successful
Details
MacOS Python Release Kokoro build successful
Details
MacOS Ruby 2.3 Kokoro build successful
Details
MacOS Ruby 2.4 Kokoro build successful
Details
MacOS Ruby 2.5 Kokoro build successful
Details
MacOS Ruby 2.6 Kokoro build successful
Details
MacOS Ruby Release Kokoro build successful
Details
Mergeable Mergeable Run has been Completed!
Details
Windows C# Kokoro build successful
Details
Windows Csharp Release Kokoro build successful
Details
Windows Python Release Kokoro build successful
Details
cla/google All necessary CLAs are signed
@TeBoring TeBoring deleted the TeBoring:201909101746 branch Sep 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.