Skip to content

Integrate from Piper for C++, Java, and Python#8617

Merged
haberman merged 18 commits intoprotocolbuffers:masterfrom
deannagarcia:sync-stage
May 24, 2021
Merged

Integrate from Piper for C++, Java, and Python#8617
haberman merged 18 commits intoprotocolbuffers:masterfrom
deannagarcia:sync-stage

Conversation

@deannagarcia
Copy link
Copy Markdown
Contributor

Important: this integration must be merged, not squashed!

PROTOBUF_SYNC_PIPER
PROTOBUF_SYNC_PIPER
# Conflicts:
#	java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
#	src/google/protobuf/repeated_field_unittest.cc
@haberman haberman merged commit 636132b into protocolbuffers:master May 24, 2021
@deannagarcia deannagarcia deleted the sync-stage branch May 24, 2021 22:42
jtattermusch added a commit to jtattermusch/protobuf that referenced this pull request Jun 18, 2021
jtattermusch added a commit that referenced this pull request Jun 18, 2021
Reintroduce setup.py changes from #8280 erased by piper import #8617
bithium pushed a commit to bithium/protobuf that referenced this pull request Sep 4, 2023
Integrate from Piper for C++, Java, and Python
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants