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

Update 3.18.x branch for 3.18.2 release #9374

Merged
merged 4 commits into from Jan 5, 2022

Conversation

acozzette
Copy link
Member

This pull request cherry-picks #9371 and updates the change log and version numbers for the 3.18.2 release.

…s#9371)

Credit should go to @elharo for most of these Java changes--I am just
cherry-picking them from our internal codebase. The one thing I did
change was to give the UTF-8 validation tests their own Bazel test
target. This makes it possible to give the other tests a shorter
timeout, which is important for UnknownFieldSetPerformanceTest in
particular.
@acozzette
Copy link
Member Author

I think I introduced a merge conflict in the BUILD file, let me fix that.

Copy link
Contributor

@perezd perezd left a comment

Choose a reason for hiding this comment

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

LGTM!

@acozzette acozzette merged commit 6c6b077 into protocolbuffers:3.18.x Jan 5, 2022
@acozzette acozzette deleted the release-notes-3.18.2 branch January 5, 2022 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants