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

Merge 21.8 into main #10788

Merged
merged 19 commits into from
Oct 19, 2022
Merged

Merge 21.8 into main #10788

merged 19 commits into from
Oct 19, 2022

Conversation

mkruskal-google
Copy link
Member

No description provided.

deannagarcia and others added 18 commits October 4, 2022 12:18
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 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>
@mkruskal-google mkruskal-google merged commit c302d90 into main Oct 19, 2022
@zhangskz zhangskz deleted the main-202210181433 branch February 10, 2023 21:25
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.

7 participants