Commit Graph

158 Commits

Author SHA1 Message Date
Mark D. Roth 863113a0d9 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-16 14:18:28 -08:00
Craig Tiller c80fa2f673 Merge pull request #8680 from ctiller/no_more_legacy
Remove legacy poller
2016-11-15 17:25:27 -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 c56c3ad259 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-09 13:32:36 -08:00
Muxi Yan 53c4c28b43 Add new util file to podspec 2016-11-08 13:34:02 -08:00
Mark D. Roth fc75321830 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-08 10:57:20 -08:00
Craig Tiller e6684f415e Remove legacy poller 2016-11-08 08:17:43 -08:00
Craig Tiller b720b609ea Merge github.com:grpc/grpc into grpc_slice 2016-11-08 07:20:27 -08:00
Mark D. Roth c22717ec63 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-07 09:41:07 -08:00
Craig Tiller 503653e27e Merge pull request #8456 from ctiller/pid_ctl
Simple PID controller
2016-11-04 14:17:14 -07:00
Mark D. Roth ea846a0800 Rename method_config.[ch] to service_config.[ch]. 2016-11-03 11:32:54 -07:00
Yuchen Zeng 64d518e3b0 Merge remote-tracking branch 'upstream/master' into tos 2016-11-02 16:27:49 -07:00
Craig Tiller 41fd9f2343 Merge github.com:grpc/grpc into grpc_slice 2016-10-31 14:42:53 -07:00
Michael Lumish 15b04e41f1 Merge pull request #8559 from murgatroid99/v1.0.1_upmerge
V1.0.1 upmerge
2016-10-28 14:22:09 -07:00
murgatroid99 5d6ae930ab Merge remote-tracking branch 'upstream/v1.0.x' into v1.0.1_upmerge 2016-10-28 11:48:22 -07:00
Craig Tiller fa014a86e3 Merge github.com:grpc/grpc into pid_ctl 2016-10-28 07:31:20 -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 c3350541e3 Generate build files 2016-10-26 16:19:01 -07:00
Mark D. Roth e4e457ed76 Merge remote-tracking branch 'upstream/master' into circular_dependency_fix 2016-10-26 13:06:03 -07:00
Mark D. Roth bfe56801ad Move method_config module from ext/client_channel to lib/transport. 2016-10-26 12:45:20 -07:00
Mark D. Roth fb809b7850 Merge remote-tracking branch 'upstream/master' into resolver_channel_args 2016-10-26 09:12:25 -07:00
Muxi Yan 447d0a22e6 Advance versions of gRPC from v1.0.1-pre1 to v1.0.1 2016-10-25 14:14:12 -07:00
Craig Tiller fe8c5012d3 Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-24 14:49:18 -07:00
murgatroid99 b516cadc2a Merge branch 'master' into uv_core_transport 2016-10-21 15:54:42 -07:00
Mark D. Roth ae07f7fdc6 Merge remote-tracking branch 'upstream/master' into resolver_channel_args 2016-10-21 15:23:53 -07:00
Mark D. Roth af84245131 Remove resolver_result. 2016-10-21 15:05:15 -07:00
Muxi Yan 6fd881e183 Advance versions of BoringSSL in podspec and template 2016-10-21 14:46:01 -07:00
Matt Kwong e9255d04e5 fix sanity 2016-10-20 19:08:57 -07:00
Craig Tiller dd2fa6482a Add pid controller test 2016-10-20 15:46:32 -07:00
murgatroid99 10edf68eec Merge branch 'master' into uv_core_transport 2016-10-19 15:19:00 -07:00
Mark D. Roth eb35a1d16b Merge remote-tracking branch 'upstream/master' into rename_client_config 2016-10-19 14:53:42 -07:00
Craig Tiller 9ea0f2c6e8 Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-19 14:44:53 -07:00
murgatroid99 59f347e125 Merge branch 'master' into uv_core_transport 2016-10-19 13:53:21 -07:00
Mark D. Roth 605a8f12ed Merge remote-tracking branch 'upstream/master' into service_config 2016-10-18 11:06:33 -07:00
Muxi Yan a507de342d Advance version of BoringSSL 2016-10-17 20:57:25 -07:00
Muxi Yan 6758caae31 Advance versions from 1.0.0 to 1.0.1-pre1 2016-10-17 17:10:26 -07:00
Craig Tiller 20afa3d7c9 BufferPool --> ResourceQuota 2016-10-17 14:52:14 -07:00
Craig Tiller 654b242ce7 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-10-17 14:31:44 -07:00
Craig Tiller 8c94df19d4 Merge github.com:grpc/grpc into direct-calls 2016-10-17 13:25:45 -07:00
Mark D. Roth 6a721b5b3f Rename grpc_hash_table to grpc_mdstr_hash_table. 2016-10-14 12:43:34 -07:00
Yuchen Zeng de3daf5d63 More interfaces for grpc_socket_mutator 2016-10-13 17:26:26 -07:00
Ken Payson 82e4ec741b Moved cv polling into ev_poll_posix.c 2016-10-13 12:26:01 -07:00
Yuchen Zeng a4f708a4c4 Introduce grpc_socket_mutator 2016-10-11 18:36:24 -07:00
Yuchen Zeng 929f4c652f Add tos configuration in channel args 2016-10-10 16:02:43 -07:00
Mark D. Roth 15195741d7 Merge remote-tracking branch 'upstream/master' into rename_client_config 2016-10-07 09:02:28 -07:00
murgatroid99 eebb129fd3 Merge branch 'master' into uv_core_transport 2016-10-03 09:33:29 -07:00
murgatroid99 c36f6ea745 Compile and link core tests with libuv 2016-10-03 09:24:09 -07:00
Ken Payson 5b5c8071c6 Merge master 2016-09-30 09:04:01 -07:00
Craig Tiller d88c461217 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-09-29 10:35:38 -07:00