Skip to content

Merge Release 0.12 into master#4301

Closed
jcanizales wants to merge 25 commits intomasterfrom
release-0_12
Closed

Merge Release 0.12 into master#4301
jcanizales wants to merge 25 commits intomasterfrom
release-0_12

Conversation

@jcanizales
Copy link
Copy Markdown
Contributor

Fixes #4295, and keeps things consistent overall.

Let me check why can't it be merged automatically...

nicolasnoble and others added 25 commits December 1, 2015 22:52
For a termination action to properly mark an _End as having stopped it
must clear the _End's _cycle attribute. To be able to do that the
termination action must hold a reference to the _End instance.
Migrating the _termination_action behavior that creates termination
actions into the scope of the _End instance is the best way to afford
the needed instance reference.
Context management is implemented.

Stub deletion now cancels all RPCs immediately.
Use BoringSSL instead of OpenSSL
This reorganizes the Python code, scraps the current testing
infrastructure, and implements a simple test discovery and run script
based on the standard Python unittest library so we can trust that our
tests are running.
TODO:
- Documentation
- Make public
- Check I’ve implemented all NSMutDict required methods
Use a custom NSMutableDictionary subclass for request headers
Make Python testing predictable again.
Generalize metadata plugin arguments to future-proof it
@googlebot
Copy link
Copy Markdown

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@jcanizales
Copy link
Copy Markdown
Contributor Author

CC @w4-sjcho to make Googlebot happy. Your commits are going to be merged from the release branch into the master branch (which was expected and is normal business) :)

@jcanizales jcanizales removed the cla: no label Dec 7, 2015
@murgatroid99
Copy link
Copy Markdown
Member

That's strange. Those commits are only in this branch because I backported them from master. I guess it doesn't recognize that if they're in the middle.

@jcanizales
Copy link
Copy Markdown
Contributor Author

I fixed the conflicts manually at PR #4306.

@jcanizales jcanizales closed this Dec 7, 2015
@lock lock bot locked as resolved and limited conversation to collaborators Jan 29, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants