Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into http_connect | 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 pull request #7559 from dgquintas/codegen_cleanse | Craig Tiller | 2016-09-13 |
| |\ \ | |||
| | | * | 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 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 github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-02 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-02 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 2016-09-01 |
| |\ \ \ \ | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-01 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Move subchannel_call_holder code into client_channel module. | Mark D. Roth | 2016-08-31 |
| * | | | | | add trace context proto | Alistair Veitch | 2016-08-31 |
| |/ / / / | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-08-31 |
|\| | | | | |||
| | | * | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-30 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-30 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
| |\ \ \ \ | |||
| | * | | | | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 |
| * | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | * | | | | Move Podspecs to v1 | Jorge Canizales | 2016-08-18 |
| | | * | | | Percent encoding routines | Craig Tiller | 2016-08-18 |
| | |/ / / | |/| | | | |||
| | * | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 |
* | | | | | Merge branch 'handshaker_api' into http_connect | Mark D. Roth | 2016-08-04 |
|\| | | | | |||
| | | * | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-04 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #7554 from muxi/fix-cronet-interop-test | Muxi Yan | 2016-08-02 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| |\ \ \ \ \ | |||
* | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-08-02 |
|\| | | | | | | |||
| * | | | | | | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-08-02 |
|\| | | | | | | | |||
| | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-02 |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| | | | | | | * | added gpr_types.h | David Garcia Quintas | 2016-08-01 |
| * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ \ \ \ | |||
| | | | | * | | | | Minor revisions | Muxi Yan | 2016-07-29 |
| | | | | | | | * | removed codegen/slice_buffer.h and scrubbed codegen/slice.h | David Garcia Quintas | 2016-07-27 |
| | | | | | | | * | removed codegen/log.h | David Garcia Quintas | 2016-07-27 |
| | | | | | | | * | removed codegen/time.h | David Garcia Quintas | 2016-07-27 |
| | | | | | | | * | removed codegen/byte_buffer.h | David Garcia Quintas | 2016-07-27 |
| | | | | * | | | | Fix Objective-C test pods for Cronet tests | Muxi Yan | 2016-07-27 |
| | | |_|/ / / / | | |/| | | | | | |||
| | | | | | | * | removed codegen/alloc.h | David Garcia Quintas | 2016-07-27 |
| | | |_|_|_|/ | | |/| | | | | |||
* | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-07-26 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | | * | | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-07-24 |
| | | | | | | |\ | |||
| | * | | | | | \ | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||
* | / | | | | | | Update build files. | Mark D. Roth | 2016-07-22 |
|/ / / / / / / | |||
| | | | * / / | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-21 |
|\| | | | | |