Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Removed duplicated dependency for grpclb | 2016-08-09 | |
* | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
|\ | |||
* \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-04 | |
|\ \ | |||
| * \ | Merge pull request #7370 from rjshade/move_timeout_encoding | 2016-08-02 | |
| |\ \ | |||
| | | * | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-08-02 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| |\ \ \ | |||
| | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-08-02 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-27 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #7498 from thinkerou/wrap_php7 | 2016-07-26 | |
| |\ \ \ \ \ | |||
| | | | | * \ | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
|\| | | | | | | |||
| * | | | | | | Merge pull request #7451 from y-zeng/seperate_generated_files | 2016-07-25 | |
| |\ \ \ \ \ \ | |||
* | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
|\| | | | | | | | |||
| | | * | | | | | add file to build.yaml | 2016-07-25 | |
| * | | | | | | | Merge pull request #7395 from markdroth/handshake_api | 2016-07-25 | |
| |\ \ \ \ \ \ \ | |||
| | | | | | * \ \ | merge to upstream/master | 2016-07-21 | |
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | | | |||
| * | | | | | | | | Merge pull request #7269 from y-zeng/cli_call | 2016-07-21 | |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| | | * | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | 2016-07-20 | |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| | | | * | | | | | Fix sanity check | 2016-07-19 | |
| | | | | | | * | | Merge branch 'master' into move_timeout_encoding | 2016-07-19 | |
| | | | | | | |\ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
* / | | | | | | | | Splitting interop_server.cc | 2016-07-18 | |
|/ / / / / / / / | |||
| | | * / / / / | Separate generated file and protobuf dependency | 2016-07-18 | |
| |_|/ / / / / |/| | | | | | | |||
| | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-07-15 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-07-14 | |
| | | |\ \ \ \ | |||
| | * | | | | | | Added handshaker.[ch] to build.yaml. | 2016-07-14 | |
| | | |/ / / / | | |/| | | | | |||
| | | | | * | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | 2016-07-13 | |
| | | |_|/ / | | |/| | | | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-07-12 | |
| | | | | |\ | | | |_|_|/ | | |/| | | | |||
* | | | | | | Merge github.com:grpc/grpc into delayed-write | 2016-07-12 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Master is now 1.1.0-dev. | 2016-07-12 | |
| * | | | | | Flagging master as 1.0.0-pre1. | 2016-07-12 | |
* | | | | | | Merge github.com:grpc/grpc into delayed-write | 2016-07-11 | |
|\ \ \ \ \ \ | |||
| | * | | | | | Fix mac build | 2016-07-08 | |
| |/ / / / / | |||
| | * | | | | Support server reflection in CLI | 2016-07-07 | |
* | | | | | | Merge github.com:grpc/grpc into delayed-write | 2016-07-06 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | * | | | | Added missing dependencies to grpc++_base | 2016-07-06 | |
| |/ / / / | |||
| * | | | | Merge pull request #6893 from y-zeng/handler_http_response | 2016-07-01 | |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge remote-tracking branch 'google/master' into contrib-cmake | 2016-07-02 | |
| |\ \ \ \ \ | |||
* | | | | | | | Refactor workqueues a little to make them great again | 2016-07-01 | |
| | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-07-01 | |
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | |||
* | / | | | | | Enable workqueue_test on Windows | 2016-07-01 | |
| |/ / / / / |/| | | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into handler_http_response | 2016-06-30 | |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| | | | | * | Move channel_filter.h from include/ tree to src/ tree. | 2016-06-29 | |
| | | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-06-29 | |
| | | | | |\ | |||
* | | | | | \ | Merge pull request #6885 from yang-g/import | 2016-06-28 | |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #6920 from murgatroid99/grpc_trace_granularity | 2016-06-28 | |
|\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into import | 2016-06-28 | |
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||
| * | | | | | | | | Resolved merge conflicts with master | 2016-06-27 | |
| |\ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | Annotate error.c for timing, remove broken test | 2016-06-27 | |
| |/ / / / / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #6973 from makdharma/network_status_change | 2016-06-27 | |
|\ \ \ \ \ \ \ \ \ |