Merge 3.15.x into the master branch#8447
Conversation
This closes protocolbuffers#8349, although we will probably still pursue some other name in the future.
We now hold the mutex for both map insertions, to protect against a concurrent GC that removes from the seconary map before we can insert into the weak map.
…rymap Fix unbounded memory growth for Ruby <2.7.
If the message types are different, equality comparison must return false.
Fixed message equality in cases where the message type is different.
|
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 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 ℹ️ Googlers: Go here for more info. |
|
The CLA is OK because this pull request is just merging commits that have already gone through the CLA check. |
Merge 3.15.x into the master branch
This incorporates the changes from the 3.15.7 release.