Commit Graph

87 Commits

Author SHA1 Message Date
Mark D. Roth 1a2e6ac10d Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-23 09:47:01 -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
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
Mark D. Roth 85102a9eb6 Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-16 13:24:05 -07:00
Mark D. Roth eaea5caab3 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-16 13:12:21 -07:00
Mark D. Roth 34dac9d4ca Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-16 13:06:26 -07:00
Craig Tiller ee43d7bbb1 Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-closures
Revert "Revert "Grand unified closures""
2016-09-16 12:11:11 -07:00
Mark D. Roth 8b7678cf84 Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-16 10:51:15 -07:00
Mark D. Roth abf03aed93 Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-16 07:35:37 -07:00
Craig Tiller a51f54192a Merge pull request #7559 from dgquintas/codegen_cleanse
Removed references to public APIs from codegen/
2016-09-13 19:40:43 -07:00
Mark D. Roth 5e1b58bcea Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-12 16:59:00 -07:00
Craig Tiller 57726ca5a9 Revert "Revert "Grand unified closures"" 2016-09-12 11:59:45 -07:00
Craig Tiller 537f7c2a13 Revert "Grand unified closures" 2016-09-12 11:56:39 -07:00
Mark D. Roth 242dc4be0e Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-12 11:54:25 -07:00
Vizerai 12d1fc61d8 initial commit of tracing context files 2016-09-09 14:22:19 -07:00
Mark D. Roth ebfcd97940 Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-08 07:16:34 -07:00
Mark D. Roth c890042118 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-07 09:18:04 -07:00
Mark D. Roth 164f0e926d Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-07 09:14:50 -07:00
Craig Tiller 344834b40b Merge github.com:grpc/grpc into grand-unified-closures 2016-09-07 08:39:05 -07:00
Craig Tiller e0321637d7 Merge pull request #7774 from ctiller/percent-encoder
Percent encoding routines
2016-09-06 22:08:12 -07:00
Mark D. Roth 6c3295a5a2 Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-06 11:04:11 -07:00
Mark D. Roth 7bfa1a8343 Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-06 10:44:32 -07:00
Craig Tiller 255dad3630 Merge github.com:grpc/grpc into grand-unified-closures 2016-09-02 09:15:23 -07:00
David Garcia Quintas e44902ecc9 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-02 15:27:33 +02:00
Mark D. Roth fb475c93c4 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-01 14:22:55 -07:00
Mark D. Roth 79620aaa10 Merge pull request #7943 from markdroth/client_channel_cleanup
Move subchannel_call_holder code into client_channel module.
2016-09-01 13:12:56 -07:00
David Garcia Quintas d3dee72437 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-01 20:18:41 +02:00
Mark D. Roth 89119fa9b6 Merge branch 'client_channel_cleanup' into deadline_filter 2016-09-01 08:29:56 -07:00
Mark D. Roth 4c0fe49f76 Move subchannel_call_holder code into client_channel module. 2016-08-31 13:51:55 -07:00
Alistair Veitch a0c69f9099 add trace context proto 2016-08-31 12:01:27 -07:00
Mark D. Roth ceb39ae60c Merge remote-tracking branch 'upstream/master' into http_connect 2016-08-31 10:46:58 -07:00
Craig Tiller dadda8bf52 Merge github.com:grpc/grpc into grand-unified-closures 2016-08-30 20:51:45 -07:00
David Garcia Quintas f3581bf90a Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-08-30 04:45:50 -07:00
Mark D. Roth 8e2c98adf0 Merge pull request #7839 from markdroth/rename_client_config
Rename grpc_client_config to grpc_resolver_result.
2016-08-29 13:27:23 -07:00
Mark D. Roth 14c072ccc0 Initial code to move deadline timer into a filter. Timer cancellation
not working right -- will fix in subsequent commit.
2016-08-26 08:31:34 -07:00
Mark D. Roth 54d78e2640 Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-08-25 08:38:14 -07:00
Mark D. Roth af00d8bfb2 Add channel arg for max send message size and add message size filter. 2016-08-23 12:48:16 -07:00
Mark D. Roth ff4df06a66 Rename grpc_client_config to grpc_resolver_result. 2016-08-22 15:02:49 -07:00
Nicolas "Pixel" Noble e3e17d3f6b Merge branch 'v1.0.x' of https://github.com/grpc/grpc 2016-08-20 01:45:32 +02:00
Jorge Canizales 4a18c67b77 Move Podspecs to v1 2016-08-18 13:26:25 -07:00
Craig Tiller 17ed6b17c7 Percent encoding routines 2016-08-18 09:33:33 -07:00
Nicolas "Pixel" Noble a469e5d42e grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. 2016-08-17 05:47:55 +02:00
Mark D. Roth 32387b3a34 Merge branch 'handshaker_api' into http_connect 2016-08-04 11:19:26 -07:00
Craig Tiller 106df11093 Merge github.com:grpc/grpc into grand-unified-closures 2016-08-04 09:22:34 -07:00
Muxi Yan d924b01482 Merge pull request #7554 from muxi/fix-cronet-interop-test
Fix Objective-C test pods for Cronet tests
2016-08-02 16:29:30 -07:00
kpayson64 5e1fbd2061 Merge pull request #7370 from rjshade/move_timeout_encoding
Move timeout_encoding to core/lib/transport
2016-08-02 16:20:01 -07:00
Mark D. Roth 34befcaa20 Merge remote-tracking branch 'upstream/master' into http_connect 2016-08-02 14:58:36 -07:00
kpayson64 329d6473db Merge pull request #6774 from a-veitch/add_resource
Add Census resource API and implementation.
2016-08-02 12:46:43 -07:00