Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
|\ | |||
* | | Forgot one file | Nicolas "Pixel" Noble | 2016-08-04 |
* | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-04 |
|\ \ | |||
| * | | regenerated projects | David Garcia Quintas | 2016-08-03 |
| * | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| |\ \ | |||
| | | * | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-08-02 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| |\ \ \ | |||
| | | | * | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-08-02 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-02 |
|\ \ \ \ \ \ | |||
| | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | * | | | | regenerated projects | David Garcia Quintas | 2016-08-01 |
| * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ \ \ | |||
| | | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | | | | * | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
* | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ | |||
* | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | | | | | |||
| * | | | | | | | | Merge pull request #7395 from markdroth/handshake_api | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ \ | |||
| | | | | | | * \ \ | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | | | | | | |\ \ \ | |||
| * | | | | | | \ \ \ | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||
* / | | | | | | | | | | Splitting interop_server.cc | Nicolas "Pixel" Noble | 2016-07-18 |
|/ / / / / / / / / / | |||
| | | * / / / / / / | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| |_|/ / / / / / / |/| | | | | | | | | |||
| | | | | * | | | | 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 |
| |/ / / / / / / |/| | | | | | | | |||
| | * | | | | | | Simplified LR filter | David Garcia Quintas | 2016-07-13 |
| | | | | | * | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | Robbie Shade | 2016-07-13 |
| |_|_|_|_|/ / |/| | | | | | | |||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-07-12 |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-07-12 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
| | * | | | | | Merge remote-tracking branch 'origin/fix_tsan' into lr_july_16 | David Garcia Quintas | 2016-07-11 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| | * | | | | | Added new features to load reporting. | David Garcia Quintas | 2016-07-10 |
* | | | | | | | Fix mac build | Yuchen Zeng | 2016-07-08 |
| |/ / / / / |/| | | | | | |||
| * | | | | | Rerun generate_projects.sh | Yuchen Zeng | 2016-07-07 |
| * | | | | | Support server reflection in CLI | Yuchen Zeng | 2016-07-07 |
* | | | | | | Added missing dependencies to grpc++_base | David Garcia Quintas | 2016-07-06 |
|/ / / / / | |||
* | | | | | Merge pull request #6893 from y-zeng/handler_http_response | Nicolas Noble | 2016-07-01 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge remote-tracking branch 'google/master' into contrib-cmake | Nicolas "Pixel" Noble | 2016-07-02 |
|\ \ \ \ \ \ | |||
| | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-07-01 |
| | | | | | |\ | | | | |_|_|/ | | | |/| | | | |||
| | | * | | | | Merge branch 'master' into filter_call_init_failure | Mark D. Roth | 2016-07-01 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | Merge remote-tracking branch 'upstream/master' into handler_http_response | Yuchen Zeng | 2016-06-30 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | | | | * | Move channel_filter.h from include/ tree to src/ tree. | Mark D. Roth | 2016-06-29 |
| | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-06-29 |
| | | | | | |\ | | | | |_|_|/ | | | |/| | | | |||
| * | | | | | | Merge pull request #6920 from murgatroid99/grpc_trace_granularity | Jan Tattermusch | 2016-06-28 |
| |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
| | |\ \ \ \ \ \ | |||
| * | | | | | | | | Annotate error.c for timing, remove broken test | Craig Tiller | 2016-06-27 |
| | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 |
| |\ \ \ \ \ \ \ | |||
| | | | | * | | | | Added test for filter whose call initialization fails, and fixed bugs | Mark D. Roth | 2016-06-23 |
| | | * | | | | | | Merge branch 'master' into grpc_trace_granularity | murgatroid99 | 2016-06-23 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||
| * | | | | | | | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-23 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||
| | | | | | * | | | regenerated projects | David Garcia Quintas | 2016-06-22 |