Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 |
|\ | |||
| * | Merge pull request #8618 from markdroth/channel_info_api | Mark D. Roth | 2016-11-08 |
| |\ | |||
| * \ | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ | |||
| | * | | Fix sanity | Craig Tiller | 2016-11-08 |
| * | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\| | | |||
| * | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ | |||
| | | | * | Fix C++ filter API and add test for it. | Mark D. Roth | 2016-11-07 |
| | | |/ | | |/| | |||
* | | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 |
|\ \ \ \ | | |/ / | |/| | | |||
| | | * | Get user agent right | Craig Tiller | 2016-11-04 |
| | |/ | |/| | |||
| * | | Order files - things were making sanity sad | Craig Tiller | 2016-11-04 |
| * | | Merge pull request #8456 from ctiller/pid_ctl | Craig Tiller | 2016-11-04 |
| |\ \ | |||
* | | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-04 |
|\| | | | |||
| * | | | Merge pull request #8537 from markdroth/remove_fake_resolver | Mark D. Roth | 2016-11-04 |
| |\ \ \ | |||
| | | | * | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-04 |
| | | | |\ | |||
| * | | | \ | Merge github.com:grpc/grpc into microbench | Craig Tiller | 2016-11-04 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
* | | | | | | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 |
| |_|/ / / |/| | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into remove_fake_resolver | Mark D. Roth | 2016-11-03 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge branch 'master' into turn_it_to_11 | Vijay Pai | 2016-11-02 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge remote-tracking branch 'upstream/master' into remove_fake_resolver | Mark D. Roth | 2016-11-02 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #8523 from markdroth/lb_policy_name_channel_arg | Mark D. Roth | 2016-11-02 |
| |\ \ \ \ \ | |||
| | | * | | | | Deprecate grpc::thread and sync in favor of std::thread,mutex,etc | Vijay Pai | 2016-11-01 |
| | | * | | | | Regenerate all projects | Vijay Pai | 2016-11-01 |
| | |/ / / / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into microbench | Craig Tiller | 2016-11-01 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #8380 from y-zeng/reflection_header | Yuchen Zeng | 2016-10-31 |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge branch 'lb_policy_name_channel_arg' into remove_fake_resolver | Mark D. Roth | 2016-10-31 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | | | * | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-10-31 |
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | |||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into lb_policy_name_channel_arg | Mark D. Roth | 2016-10-31 |
| |\| | | | | | |||
| | * | | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-28 |
| | |\ \ \ \ \ | |||
| | | | | | * \ | Merge github.com:grpc/grpc into pid_ctl | Craig Tiller | 2016-10-28 |
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | * | | | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-27 |
| | |\ \ \ \ \ \ | |||
* | | | | | | | | | Change tests to use channel args instead of fake_resolver query args. | Mark D. Roth | 2016-10-27 |
|/ / / / / / / / | |||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into lb_policy_name_channel_arg | Mark D. Roth | 2016-10-27 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | | | | | * | 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 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | | | | | * | Codegen | Craig Tiller | 2016-10-26 |
| | | | | | | * | Generate build files | Craig Tiller | 2016-10-26 |
| | | | | | | * | s/gpr_slice/grpc_slice, and move around tests, impls | Craig Tiller | 2016-10-26 |
| | | | |_|_|/ | | | |/| | | | |||
* | | | | | | | Add test for setting LB policy via C++ API. | Mark D. Roth | 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 |
|\| | | | | | | |||
| | | | | * | | Initial google_benchmark integration: generated files | Craig Tiller | 2016-10-25 |
| * | | | | | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-25 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||
| | | * | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-25 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | Merge pull request #8437 from makdharma/stress_test_options | makdharma | 2016-10-25 |
| | |\ \ \ \ \ | |||
| | | | | * \ \ | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-24 |
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | | | | | * | | Merge remote-tracking branch 'upstream/master' into reflection_header | Yuchen Zeng | 2016-10-24 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | | | * | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 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 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | |