Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 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 |
| |\ \ | | |/ | |/| | |||
| | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 |
| * | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| |\ \ | |||
| * \ \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 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 |
| |\ \ \ \ | |||
* | | | | | | 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 |
* | | | | | | removed codegen/alloc.h | David Garcia Quintas | 2016-07-27 |
| |/ / / / |/| | | | | |||
| | | * | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | * | | | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | |\ \ \ | | | | |/ | | | |/| | |||
| * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-07-14 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
* | / | | | Added handshaker.[ch] to build.yaml. | Mark D. Roth | 2016-07-14 |
| |/ / / |/| | | | |||
| | | * | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | Robbie Shade | 2016-07-13 |
| |_|/ |/| | | |||
* | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
|\ \ \ | |||
| * \ \ | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
| |\ \ \ \ | |||
| | | | * \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-06-20 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | more files after running build.yaml changes through | Makarand Dharmapurikar | 2016-06-20 |
| | |/ / / | |||
* | | | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-16 |
| | |\ \ \ | |||
| | | | * | | added missing grpclb.h dep in build.yaml | David Garcia Quintas | 2016-06-15 |
| | | | * | | gRPC LB policy | David Garcia Quintas | 2016-06-15 |
| | | |/ / | |||
* | | / / | Allow disabling traces, add trace variables for pluck and timeout events | murgatroid99 | 2016-06-15 |
| |_|/ / |/| | | | |||
| * | | | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
| |\ \ \ | |/ / / |/| | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-09 |
|\ \ \ \ | |||
| | | * \ | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-09 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | Jan Tattermusch | 2016-06-08 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-08 |
|\ \ \ \ \ \ | |||
| | | | | * \ | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-08 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-07 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | implement support for adding external fd to server | Adam Michalik | 2016-06-07 |
| | * | | | | | separate posix functionality to grpc_posix.h | Adam Michalik | 2016-06-07 |
| |/ / / / / | |||
| | | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | | | * | merge to master | Alistair Veitch | 2016-06-07 |
| | | | | |\ | |||
| * | | | | \ | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-06-06 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| | | | | * | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-06 |
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | |||
| | | | | * | | Remove unused files | Sree Kuchibhotla | 2016-06-06 |