Merge 21.8 into main #10788
Merged
Merge 21.8 into main #10788
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We are seeing failures in brew uninstall protobuf due to no package. Change this to a force install to avoid the error.
Force uninstall protobuf in python macos builds
Fix for grpc.tools #17995 & protobuf #7474 (handle UTF-8 paths in argumentfile)
Merge pull request #10200 from tonydnewell/bugfix/protobuf-7474
Upgrade to kotlin 1.6
* Upgrade kokoro to Xcode 14 * Fix osx errors
21.x No longer define no_threadlocal on OpenBSD
Mark default instance as immutable first to avoid race during static initialization of default instances.
Merge pull request #10770 from protocolbuffers/googleberg-cl-480629524
Cherrypick toolchain changes
* Updating version.json and repo version numbers to: 21.8 * Update changelog Co-authored-by: Protobuf Team Bot <protobuf-team-bot@google.com>
zhangskz
approved these changes
Oct 18, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.