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 3.15.x into master #8338

Merged
merged 6 commits into from
Feb 25, 2021

Conversation

acozzette
Copy link
Member

No description provided.

haberman and others added 6 commits February 22, 2021 17:14
This fix is similar to the previous bug found in
Message.[]. The fix is the same: we need to handle
arrays and maps properly.

Fixes: protocolbuffers#8325
[Ruby] Fix for FieldDescriptor.get(msg).
The #ifdef block is duplicated with the above (which was fixed in 3.15.1).

It would be great to have this fix backported to 3.15.1 (and released as 3.15.2).
@google-cla
Copy link

google-cla bot commented Feb 23, 2021

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@acozzette
Copy link
Member Author

The CLA is OK because this pull request is just merging commits that have already gone through the CLA check.

@acozzette acozzette merged commit a6c28fb into protocolbuffers:master Feb 25, 2021
@acozzette acozzette deleted the 3.15.x-202102231541 branch February 25, 2021 00:46
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