Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'flow_control_v2' into bwest | Craig Tiller | 2016-12-27 |
|\ | |||
| * | v1.0.x → master upmerge | Nathaniel Manista | 2016-12-16 |
| |\ | |||
| * | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| * | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | Mark D. Roth | 2016-12-05 |
| * | | Revert "Remove redundant includes from string.h and tmpfile.h" | Mark D. Roth | 2016-12-05 |
| * | | Merge pull request #8922 from sreecha/slice_cleanup | Mark D. Roth | 2016-12-05 |
| |\ \ | |||
| * | | | Use the same server code for both secure and insecure servers. | Mark D. Roth | 2016-12-02 |
| | * | | Temporarily enable gpr_slice_* functions to not break api compatibility | Sree Kuchibhotla | 2016-12-01 |
| | | * | update ruby protbuf dep to 3.1.0 | Alex Polcyn | 2016-11-30 |
| * | | | Merge branch 'security_handshaker1' into security_handshaker2 | Mark D. Roth | 2016-11-29 |
| |\| | | |||
| | * | | use thread pool from v1.0.x but keep server call life cycle in master | Alexander Polcyn | 2016-11-23 |
| * | | | Rename security handshaker files. | Mark D. Roth | 2016-11-17 |
| * | | | Use the same connector code for both secure and insecure clients. | Mark D. Roth | 2016-11-17 |
| | * | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-16 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #8680 from ctiller/no_more_legacy | Craig Tiller | 2016-11-15 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
| |\ \ \ \ | |||
| | | | * \ | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | * | | | Remove legacy poller | Craig Tiller | 2016-11-08 |
| * | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | | * | | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 |
| | | * | | | Merge remote-tracking branch 'upstream/master' into tos | Yuchen Zeng | 2016-11-02 |
| | | |\| | | |||
| | * | | | | Merge github.com:grpc/grpc into pid_ctl | Craig Tiller | 2016-10-28 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||
| * | | | | | Merge branch 'buffer_pools_for_realsies' into grpc_slice | Craig Tiller | 2016-10-26 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-26 |
| | |\ \ \ \ | |||
| * | | | | | | Generate build files | Craig Tiller | 2016-10-26 |
| |/ / / / / | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into circular_dependency_fix | Mark D. Roth | 2016-10-26 |
| | |\ \ \ \ | |||
| | * | | | | | Move method_config module from ext/client_channel to lib/transport. | Mark D. Roth | 2016-10-26 |
| | | * | | | | Merge remote-tracking branch 'upstream/master' into resolver_channel_args | Mark D. Roth | 2016-10-26 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
* | | | | | | | Merge branch 'flow_control_v2' into bwest | Craig Tiller | 2016-10-24 |
|\| | | | | | | |||
| * | | | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-24 |
| |\ \ \ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-21 |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | | | * | | | | Merge remote-tracking branch 'upstream/master' into resolver_channel_args | Mark D. Roth | 2016-10-21 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | | * | | | | Remove resolver_result. | Mark D. Roth | 2016-10-21 |
* | | | | | | | | Merge branch 'flow_control_v2' into bwest | Craig Tiller | 2016-10-20 |
|\| | | | | | | | |||
* | | | | | | | | Merge branch 'bdp_est' into bwest | Craig Tiller | 2016-10-20 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||
* | | | | | | | | Add pid controller test | Craig Tiller | 2016-10-20 |
| |_|_|_|/ / / |/| | | | | | | |||
| * | | | | | | Add estimator test | Craig Tiller | 2016-10-20 |
|/ / / / / / | |||
| | | * | | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-19 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into rename_client_config | Mark D. Roth | 2016-10-19 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-19 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| | | * | | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-19 |
| | | |\ \ \ | |||
* | | | \ \ \ | Merge remote-tracking branch 'upstream/master' into service_config | Mark D. Roth | 2016-10-18 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | * | | | | | BufferPool --> ResourceQuota | Craig Tiller | 2016-10-17 |
| | * | | | | | Merge branch 'direct-calls' into buffer_pools_for_realsies | Craig Tiller | 2016-10-17 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge github.com:grpc/grpc into direct-calls | Craig Tiller | 2016-10-17 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | Rename grpc_hash_table to grpc_mdstr_hash_table. | Mark D. Roth | 2016-10-14 |
| | | | | | * | | More interfaces for grpc_socket_mutator | Yuchen Zeng | 2016-10-13 |
| | * | | | | | | Moved cv polling into ev_poll_posix.c | Ken Payson | 2016-10-13 |
| | | | | | * | | Introduce grpc_socket_mutator | Yuchen Zeng | 2016-10-11 |