Commit Graph

885 Commits

Author SHA1 Message Date
Mark D. Roth ed92f7bc04 Merge pull request #8617 from markdroth/service_config_json
Use JSON tree for service config channel arg.
2016-11-17 11:13:54 -08:00
Craig Tiller f69369741d Review feedback 2016-11-16 15:03:53 -08:00
Craig Tiller 1016d9feca Merge github.com:grpc/grpc into bm_fullstack 2016-11-16 14:56:34 -08:00
Mark D. Roth 863113a0d9 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-16 14:18:28 -08:00
Yuchen Zeng b1f6bf2ec4 Merge pull request #8086 from y-zeng/fix_gprc
Fix misspelled gprc
2016-11-11 15:11:44 -08:00
Yuchen Zeng 5c1f55af23 Merge pull request #8335 from y-zeng/tos
Add grpc_socket_mutator
2016-11-11 15:05:14 -08:00
Mark D. Roth dc5d60b814 Allow setting service config via C++ API, for use in tests. 2016-11-09 14:43:07 -08:00
Mark D. Roth 4bbdda4444 Allow getting LB policy name and service config in C++ API. 2016-11-09 14:40:22 -08:00
Craig Tiller 5910eee262 Merge github.com:grpc/grpc into bm_fullstack 2016-11-08 08:48:23 -08:00
Craig Tiller 31606bdb34 Merge github.com:grpc/grpc into grpc_slice 2016-11-08 07:46:14 -08:00
Craig Tiller 1cb088441a s/std::string/grpc::string/g 2016-11-08 07:05:33 -08:00
Craig Tiller ed9132427a Get user agent right 2016-11-04 16:31:30 -07:00
Craig Tiller 7a4ac73d5b Merge github.com:grpc/grpc into bm_fullstack 2016-11-04 08:44:50 -07:00
Craig Tiller 32df467f11 Merge github.com:grpc/grpc into grpc_slice 2016-11-04 08:21:56 -07:00
Yuchen Zeng 64d518e3b0 Merge remote-tracking branch 'upstream/master' into tos 2016-11-02 16:27:49 -07:00
Vijay Pai 739a93e47f Merge branch 'master' into turn_it_to_11 2016-11-02 16:00:52 -07:00
Mark D. Roth 57f30d1518 Merge pull request #8523 from markdroth/lb_policy_name_channel_arg
Allow setting LB policy name via the C++ API
2016-11-02 08:42:23 -07:00
Mark D. Roth 754b2b88bc Code review changes. 2016-11-02 08:39:16 -07:00
Vijay Pai 320ed13d3e Deprecate grpc::thread and sync in favor of std::thread,mutex,etc 2016-11-01 17:16:55 -07:00
Vijay Pai 5c41bab92c Remove references to NO_CHRONO option 2016-11-01 16:57:42 -07:00
Vijay Pai e08fe4f41e Remove separate versions of code based on presence of threading in compiler 2016-11-01 16:50:38 -07:00
Vijay Pai 713c7b87e1 clang-format 2016-11-01 16:33:18 -07:00
Vijay Pai c0b2acb1a0 Use C++11 final and override 2016-11-01 16:31:56 -07:00
Craig Tiller 7213aa78da Merge branch 'microbench' into bm_fullstack 2016-11-01 14:55:00 -07:00
Vijay Pai 80b292709c Stop supporting non-C++11 conformant compilers 2016-11-01 13:38:40 -07:00
Yuchen Zeng 0df7d349b7 Merge pull request #8380 from y-zeng/reflection_header
Remove generated pb files
2016-10-31 15:27:48 -07:00
Craig Tiller 41fd9f2343 Merge github.com:grpc/grpc into grpc_slice 2016-10-31 14:42:53 -07:00
Mark D. Roth 7e0c2f8301 Merge remote-tracking branch 'upstream/master' into lb_policy_name_channel_arg 2016-10-31 14:20:01 -07:00
Sree Kuchibhotla 1e088b4219 Merge branch 'master' into rpc_mgr 2016-10-28 17:34:55 -07:00
Craig Tiller 28b72428a8 clang-format 2016-10-26 21:15:29 -07:00
Craig Tiller 5b676a6b1a Fix include guards 2016-10-26 21:09:29 -07:00
Craig Tiller 618e67d655 s/GPR_SLICE/GRPC_SLICE/g 2016-10-26 21:08:10 -07:00
Craig Tiller 6e080a3651 Merge branch 'buffer_pools_for_realsies' into grpc_slice 2016-10-26 21:00:53 -07:00
Craig Tiller 3d357d901c Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-26 20:52:03 -07:00
Craig Tiller b37d53ebc0 Bulk update #includes 2016-10-26 16:16:35 -07:00
Craig Tiller d41a4a720f s/gpr_slice/grpc_slice, and move around tests, impls 2016-10-26 16:16:06 -07:00
Mark D. Roth 7190b0c651 Add ChannelArguments::SetLoadBalancingPolicyName() to C++ API. 2016-10-26 12:54:59 -07:00
Craig Tiller 1d0fce9d60 Add some endpoint pair tests 2016-10-26 08:26:22 -07:00
Sree Kuchibhotla 9193119599 Merge branch 'master' into rpc_mgr 2016-10-24 16:18:58 -07:00
Yuchen Zeng 8e386a6999 Merge remote-tracking branch 'upstream/master' into reflection_header 2016-10-24 16:17:40 -07:00
Yang Gao 3cb89bcf4b Merge pull request #8281 from gcasto/cronet_cpp_api
Add C++ Api For Cronet
2016-10-24 15:44:55 -07:00
Yuchen Zeng d30699c7be Merge remote-tracking branch 'upstream/master' into reflection_header 2016-10-24 13:00:10 -07:00
Sree Kuchibhotla 26ef574874 clang format issues 2016-10-24 12:39:04 -07:00
Sree Kuchibhotla f72ec6b37b Move thread_manager.h header from server.h to server_cc.cc 2016-10-24 11:09:43 -07:00
Sree Kuchibhotla c5fb957e50 Merge branch 'master' into rpc_mgr 2016-10-21 14:38:21 -07:00
Craig Tiller 8f67b647fd Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-20 15:53:04 -07:00
Vijay Pai 9243c74868 Merge pull request #8365 from vjpai/fc_1dstream
Support request separation of server-side streamed RPC
2016-10-20 14:31:14 -07:00
Vijay Pai bcc59f425c Remove a useless forward declaration 2016-10-20 11:38:04 -07:00
Craig Tiller 6952b213b7 Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-19 13:36:59 -07:00
Sree Kuchibhotla da069a506d Rename sync_methods_ to sync_requests_ 2016-10-19 11:22:29 -07:00