Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #8617 from markdroth/service_config_json | Mark D. Roth | 2016-11-17 |
|\ | |||
* | | Review feedback | Craig Tiller | 2016-11-16 |
* | | Merge github.com:grpc/grpc into bm_fullstack | Craig Tiller | 2016-11-16 |
|\ \ | |||
| | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-16 |
| | |\ | | |/ | |/| | |||
| * | | Merge pull request #8086 from y-zeng/fix_gprc | Yuchen Zeng | 2016-11-11 |
| |\ \ | |||
| * \ \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
| |\ \ \ | |||
| | | | * | Allow setting service config via C++ API, for use in tests. | Mark D. Roth | 2016-11-09 |
| | | | * | Allow getting LB policy name and service config in C++ API. | Mark D. Roth | 2016-11-09 |
| | |_|/ | |/| | | |||
* | | | | Merge github.com:grpc/grpc into bm_fullstack | Craig Tiller | 2016-11-08 |
|\ \ \ \ | |||
| | * \ \ | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | s/std::string/grpc::string/g | Craig Tiller | 2016-11-08 |
| * | | | | Get user agent right | Craig Tiller | 2016-11-04 |
* | | | | | Merge github.com:grpc/grpc into bm_fullstack | Craig Tiller | 2016-11-04 |
|\| | | | | |||
| | * | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-04 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into tos | Yuchen Zeng | 2016-11-02 |
| | | |\ \ | |||
| * | | \ \ | Merge branch 'master' into turn_it_to_11 | Vijay Pai | 2016-11-02 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | Merge pull request #8523 from markdroth/lb_policy_name_channel_arg | Mark D. Roth | 2016-11-02 |
| | |\ \ \ \ | |||
| | | * | | | | Code review changes. | Mark D. Roth | 2016-11-02 |
| * | | | | | | Deprecate grpc::thread and sync in favor of std::thread,mutex,etc | Vijay Pai | 2016-11-01 |
| * | | | | | | Remove references to NO_CHRONO option | Vijay Pai | 2016-11-01 |
| * | | | | | | Remove separate versions of code based on presence of threading in compiler | Vijay Pai | 2016-11-01 |
| * | | | | | | clang-format | Vijay Pai | 2016-11-01 |
| * | | | | | | Use C++11 final and override | Vijay Pai | 2016-11-01 |
* | | | | | | | Merge branch 'microbench' into bm_fullstack | Craig Tiller | 2016-11-01 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | * | | | | | Stop supporting non-C++11 conformant compilers | Vijay Pai | 2016-11-01 |
| |/ / / / / | |||
| * | | | | | Merge pull request #8380 from y-zeng/reflection_header | Yuchen Zeng | 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 |
| |\ \ \ \ \ \ | |||
| | | | | * | | | clang-format | Craig Tiller | 2016-10-26 |
| | | | | * | | | Fix include guards | Craig Tiller | 2016-10-26 |
| | | | | * | | | s/GPR_SLICE/GRPC_SLICE/g | Craig Tiller | 2016-10-26 |
| | | | | * | | | 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 |
| | |\ \ \ \ \ \ | |||
| | | | | | * | | | Bulk update #includes | Craig Tiller | 2016-10-26 |
| | | | | | * | | | s/gpr_slice/grpc_slice, and move around tests, impls | Craig Tiller | 2016-10-26 |
| | | |_|_|/ / / | | |/| | | | | | |||
| | | | | * | | | Add ChannelArguments::SetLoadBalancingPolicyName() to C++ API. | Mark D. Roth | 2016-10-26 |
| | | | |/ / / | | | |/| | | | |||
* | | / | | | | Add some endpoint pair tests | Craig Tiller | 2016-10-26 |
| |_|/ / / / |/| | | | | | |||
| * | | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-24 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into reflection_header | Yuchen Zeng | 2016-10-24 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
* | | | | | | Merge pull request #8281 from gcasto/cronet_cpp_api | Yang Gao | 2016-10-24 |
|\ \ \ \ \ \ | |||
| | | | * \ \ | Merge remote-tracking branch 'upstream/master' into reflection_header | Yuchen Zeng | 2016-10-24 |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| | * | | | | | clang format issues | Sree Kuchibhotla | 2016-10-24 |
| | * | | | | | Move thread_manager.h header from server.h to server_cc.cc | Sree Kuchibhotla | 2016-10-24 |
| | * | | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-21 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-20 |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #8365 from vjpai/fc_1dstream | Vijay Pai | 2016-10-20 |
|\ \ \ \ \ \ \ | |||
* | | | | | | | | Remove a useless forward declaration | Vijay Pai | 2016-10-20 |
| | | | * | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-19 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||
| | | * | | | | | Rename sync_methods_ to sync_requests_ | Sree Kuchibhotla | 2016-10-19 |