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 master into 3.20.x #9588

Merged
merged 3 commits into from
Mar 8, 2022
Merged

Merge master into 3.20.x #9588

merged 3 commits into from
Mar 8, 2022

Conversation

acozzette
Copy link
Member

This way we will make sure 3.20.0 includes the change from #9585.

* Updated PHP to the new version of upb.

This is a large change, as the upb API surface has been
renamed to follow Google style more closely.

* Fixed utf8_range.

* Updated Ruby for new utf8_range.

* Picked up new upb for PHP, with spelling fixes.

* Fixed the 32-bit build.
@haberman
Copy link
Member

haberman commented Mar 5, 2022

FYI one more (much smaller) change is coming to update Ruby to the latest upb.

@github-pages github-pages bot temporarily deployed to github-pages March 7, 2022 10:47 Inactive
…hash (#9513)

* allow encode json options to be an object that responds to to_hash

fixes #9500

* try to convert options arg to hash if it is not a hash
@github-pages github-pages bot temporarily deployed to github-pages March 8, 2022 18:40 Inactive
@acozzette acozzette merged commit 357e716 into 3.20.x Mar 8, 2022
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.

5 participants