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.14.x into master #8048

Merged
merged 19 commits into from
Nov 14, 2020

Conversation

acozzette
Copy link
Member

No description provided.

acozzette and others added 19 commits November 5, 2020 14:30
…fers#8022)

These files should have been added/removed in
protocolbuffers#7944, but
this was missed and Kokoro does not test "pear package".
Xcode 12+ issue a warning when targeting older iOS versions, so avoid
the issue. protocolbuffers#7980 updated the Xcode projects already.
This fixed an error I was getting about bdist_wheel not being found.
This commit updates protobuf.c to refer to the PHP version macro so that
it stays up to date. I also deleted the notes element near the top of
package.xml. This seems to be a global notes field rather than a
per-release field, so it was showing up on new releases where it doesn't
make sense.

Fixes protocolbuffers#8017.
This field turns out to be required and cannot be empty, so this commit
adds some placeholder text.
We no longer use these functions, but it turns out that we need to keep
them around for gRPC to use.
Properly release internal data structure on deallocation.
Fix protocolbuffers#7301
I committed this directory by mistake and these build artifacts should
not be checked in.
@google-cla
Copy link

google-cla bot commented Nov 13, 2020

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 PR is just merging commits that have already gone through the CLA process.

@acozzette acozzette merged commit c981d39 into protocolbuffers:master Nov 14, 2020
@acozzette acozzette deleted the 3.14.x-202011131455 branch November 14, 2020 05:19
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.

None yet

6 participants