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

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

Merged
merged 6 commits into from
May 12, 2020

Conversation

haberman
Copy link
Member

Important: this integration must be merged, not squashed!

@haberman
Copy link
Member Author

This PR fixes #7480

Copy link
Member

@acozzette acozzette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but it looks like some of the conformance test failure lists need to be updated

@haberman haberman merged commit acbdca9 into protocolbuffers:master May 12, 2020
haberman added a commit to haberman/protobuf that referenced this pull request May 12, 2020
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