Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #7664 from kpayson64/cv_wakeup_fd | kpayson64 | 2016-10-17 |
|\ | |||
* \ | Merge pull request #8127 from kpayson64/allow_pointers | kpayson64 | 2016-10-13 |
|\ \ | |||
| * | | Allow pointer channel args python | Ken Payson | 2016-10-13 |
| | * | Moved cv polling into ev_poll_posix.c | Ken Payson | 2016-10-13 |
| | * | Add condition variable polling engine | kpayson64 | 2016-10-10 |
| |/ |/| | |||
* | | Merge pull request #8324 from grpc/v1.0.x | Nathaniel Manista | 2016-10-07 |
|\ \ | |||
| * | | Drop unnecessary return statement | Nathaniel Manista | 2016-10-04 |
* | | | Merge branch 'master' of https://github.com/grpc/grpc into master-upmerge-fro... | Nicolas "Pixel" Noble | 2016-09-29 |
|\ \ \ | |||
* \ \ \ | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | Nicolas "Pixel" Noble | 2016-09-29 |
|\ \ \ \ | | |/ / | |/| | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-28 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge pull request #8168 from markdroth/max_message_size_fix | Nicolas Noble | 2016-09-28 |
|\ \ \ \ | |||
| | | * \ | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-23 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| * | | | | Expose GRPC_ARG_MAX_SEND_MESSAGE_LENGTH channel arg in python. | Mark D. Roth | 2016-09-22 |
| | |_|/ | |/| | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-21 |
|\| | | | |||
| | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-21 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #8137 from kpayson64/python_server_args | kpayson64 | 2016-09-19 |
| |\ \ \ | |||
| | * | | | Add parameter for server options | Ken Payson | 2016-09-19 |
| * | | | | Merge pull request #8052 from Vizerai/grpc_tracing | Jim King | 2016-09-19 |
| |\ \ \ \ | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-19 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-16 |
|\ \ \ \ \ \ | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-16 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-clos... | Craig Tiller | 2016-09-16 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-16 |
|\| | | | | | | | |||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #8065 from kpayson64/cygrpc_imports | kpayson64 | 2016-09-15 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | * | | Update argument documentation for channel methods | Siddharth Shukla | 2016-09-14 |
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-13 |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-12 |
| | | | | | | | | |\ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
| | | | * | | | | | | Revert "Revert "Grand unified closures"" | Craig Tiller | 2016-09-12 |
| | |_|/ / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Revert "Grand unified closures" | Craig Tiller | 2016-09-12 |
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-12 |
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| | * | | | | | | | Load roots.pem relative to current file | Ken Payson | 2016-09-11 |
| | | |_|_|/ / / | | |/| | | | | | |||
| | | * | | | | | Make .pxi imports relative | Ken Payson | 2016-09-11 |
| | |/ / / / / | |||
| | | | * / / | initial commit of tracing context files | Vizerai | 2016-09-09 |
| | | |/ / / | | |/| | | | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-09 |
| | | | | |\ | | | |_|_|/ | | |/| | | | |||
| * | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-08 |
| |\| | | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-08 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-07 |
| | | | | |\ | | | |_|_|/ | | |/| | | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-07 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | * | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-07 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #7774 from ctiller/percent-encoder | Craig Tiller | 2016-09-06 |
| |\ \ \ \ \ | |||
* | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-06 |
|\| | | | | | | |||
| | | | | * | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-06 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-02 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-01 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | Merge pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 2016-09-01 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Merge branch 'client_channel_cleanup' into deadline_filter | Mark D. Roth | 2016-09-01 |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | * | | | | | | Move subchannel_call_holder code into client_channel module. | Mark D. Roth | 2016-08-31 |