Commit Graph

138 Commits

Author SHA1 Message Date
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 3d357d901c Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-26 20:52:03 -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
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
Ken Payson 82e4ec741b Moved cv polling into ev_poll_posix.c 2016-10-13 12:26:01 -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
Craig Tiller ca3451de7a Merge github.com:grpc/grpc into direct-calls 2016-09-29 10:27:44 -07:00
Ken Payson e02c7ed37b Broke cv polling into seperate engine 2016-09-29 09:15:49 -07:00
Mark D. Roth 6600645135 Refactor hash table code into its own module and use it for method_config as well as method_config_table. 2016-09-27 10:13:56 -07:00
Mark D. Roth bec804b77f Merge branch 'deadline_filter' into service_config 2016-09-26 11:18:06 -07:00
Mark D. Roth 4c3a4688bb Move method config table code to its own module. 2016-09-23 15:19:26 -07:00
murgatroid99 08b0fab426 Merge branch 'master' into uv_core_transport 2016-09-23 14:35:49 -07:00
Craig Tiller d801cd7ed7 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-09-23 13:51:23 -07:00
Craig Tiller 5abf79a91b Merge github.com:grpc/grpc into direct-calls 2016-09-23 13:51:00 -07:00
Craig Tiller 86958768b4 Buffer pools compile 2016-09-23 12:05:34 -07:00
Mark D. Roth 1a2e6ac10d Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-23 09:47:01 -07:00
Craig Tiller 0d19c67ea9 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-09-22 16:10:29 -07:00
Craig Tiller 7af69f34df Add buffer pools to build 2016-09-22 13:48:54 -07:00
Mark D. Roth 933c955aaf Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-21 08:12:11 -07:00
Mark D. Roth 3c09810ac9 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-21 08:01:05 -07:00
Craig Tiller 1edc77c7c6 Merge github.com:grpc/grpc into direct-calls 2016-09-20 11:02:51 -07:00
Jim King 9fec58f2b4 Merge pull request #8052 from Vizerai/grpc_tracing
grpc tracing context
2016-09-19 11:35:59 -07:00
Mark D. Roth 9710e2cb71 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-19 11:13:27 -07:00
murgatroid99 bcc60f75d4 Merge branch 'master' into uv_core_transport 2016-09-16 13:44:28 -07:00
murgatroid99 9030c81f20 Add a libuv endpoint to the C core, for use in the Node library 2016-09-16 13:25:08 -07:00
Mark D. Roth 85102a9eb6 Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-16 13:24:05 -07:00