Commit Graph

1270 Commits

Author SHA1 Message Date
Craig Tiller ad158893de Merge pull request #8854 from dgquintas/backoff
Updated backoff to spec.
2016-12-02 22:33:37 -08:00
Craig Tiller ee0e0681b7 Increase timeout to make this pass reliably on Windows 2016-12-02 15:14:51 -08:00
Craig Tiller 9f07b4fbad Increase timeout for now: seems this can take longer under some configurations 2016-11-29 09:36:51 -08:00
David Garcia Quintas 353586902a Increase deadline for 1byte fixture 2016-11-28 13:29:56 -08:00
David Garcia Quintas f493651772 Merge branch 'master' of github.com:grpc/grpc into backoff 2016-11-28 11:08:25 -08:00
Craig Tiller 797bc83311 Fix comment 2016-11-28 09:52:31 -08:00
Craig Tiller a45a5e4611 Rephrase comment 2016-11-28 09:45:06 -08:00
Craig Tiller 25dba29540 Move test block, refine conditions 2016-11-28 09:24:01 -08:00
David Garcia Quintas 1edfb952d0 Updated backoff to spec. 2016-11-24 00:47:51 -08:00
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 d57a1487b1 Merge github.com:grpc/grpc into newlines 2016-11-16 14:45:10 -08:00
Mark D. Roth 863113a0d9 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-16 14:18:28 -08:00
Mark D. Roth 9b3f740eb0 clang-format 2016-11-15 07:27:50 -08:00
Mark D. Roth 6cf61536dc Fix tsan failures. 2016-11-14 22:19:22 +00:00
Mark D. Roth ad1b395243 Merge remote-tracking branch 'upstream/master' into latency_in_final_info 2016-11-14 12:10:04 -08:00
Mark D. Roth 84c8a027d3 Change JSON format to use the standard proto3 mapping for each type. 2016-11-10 09:39:34 -08:00
Mark D. Roth db4b459044 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-09 15:04:47 -08:00
Mark D. Roth 02b1ae456f clang-format 2016-11-09 14:47:21 -08:00
Mark D. Roth c56c3ad259 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-09 13:32:36 -08:00
Mark D. Roth c7d246738b Fix test breakage from recent merges. 2016-11-09 13:22:49 -08:00
Mark D. Roth 1b77f0b0a3 Merge remote-tracking branch 'upstream/master' into latency_in_final_info 2016-11-09 13:18:53 -08:00
Muxi Yan 664b587be8 Clean up end2end_(nosec_)tests 2016-11-08 13:49:23 -08:00
Muxi Yan 3d451ffb2a Update with new core 2016-11-08 12:13:07 -08:00
Muxi Yan 10a27c1427 Merge remote-tracking branch 'upstream/master' into no-authority-header-in-cronet 2016-11-08 11:28:13 -08:00
Mark D. Roth fc75321830 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-08 10:57:20 -08:00
Mark D. Roth 0ace62f832 Merge pull request #8618 from markdroth/channel_info_api
Add API for getting arbitrary state back from a channel
2016-11-08 10:45:21 -08:00
Mark D. Roth 1dd1ce784b Fix filter_latency test for sockpair and fd fixtures. 2016-11-08 10:32:24 -08:00
Mark D. Roth 3d1fe58f34 Code review changes. 2016-11-08 10:29:08 -08:00
Craig Tiller 328cbccfee Merge github.com:grpc/grpc into grpc_slice 2016-11-08 08:52:22 -08:00
Craig Tiller eba86e1853 Merge github.com:grpc/grpc into securityfuzzit 2016-11-08 08:46:46 -08:00
Craig Tiller ff69f3c461 Merge branch 'fuzzit' into apifuzzit 2016-11-08 08:45:32 -08:00
Craig Tiller a7a956fe16 Merge github.com:grpc/grpc into fuzzit 2016-11-08 08:45:18 -08:00
Craig Tiller e98181ff2b Merge github.com:grpc/grpc into grpc_slice 2016-11-08 08:05:57 -08:00
Craig Tiller 25c3543a26 Fix sanity 2016-11-08 07:57:08 -08:00
Craig Tiller d56dae0767 Merge 2016-11-08 07:47:24 -08:00
Craig Tiller b720b609ea Merge github.com:grpc/grpc into grpc_slice 2016-11-08 07:20:27 -08:00
Mark D. Roth 859cce41dc clang-format 2016-11-07 13:44:35 -08:00
Mark D. Roth 3d88341c54 Populate latency field in final_info. 2016-11-07 13:42:54 -08:00
Muxi Yan 4be8afc7ed Merge remote-tracking branch 'upstream/master' into core-end2end-tests-cronet-update 2016-11-07 10:25:55 -08:00
Craig Tiller 3e2048dd9c Merge github.com:grpc/grpc into newlines 2016-11-04 15:43:44 -07:00
Craig Tiller b65e234f7a Merge github.com:grpc/grpc into fuzzit 2016-11-04 13:20:49 -07:00
Mark D. Roth 9a8dbc406e Merge remote-tracking branch 'upstream/master' into channel_info_api 2016-11-04 12:48:57 -07:00
Craig Tiller 32df467f11 Merge github.com:grpc/grpc into grpc_slice 2016-11-04 08:21:56 -07:00
Craig Tiller b121fc7c3f Support percent-encoding status messages 2016-11-03 15:22:59 -07:00
Mark D. Roth 0e05e9e3fb Merge branch 'remove_fake_resolver' into service_config_json 2016-11-03 13:24:05 -07:00
Mark D. Roth 2b8de5cecf Don't run cancel_after_accept test for fd and socketpair fixtures. 2016-11-03 13:20:12 -07:00
Mark D. Roth 9ec28af03a Change value of channel arg to string form, and reparse in each place we use it. 2016-11-03 12:32:39 -07:00
Mark D. Roth ea846a0800 Rename method_config.[ch] to service_config.[ch]. 2016-11-03 11:32:54 -07:00
Mark D. Roth e5b4d4f35b Merge remote-tracking branch 'upstream/master' into channel_info_api 2016-11-03 09:33:36 -07:00
Mark D. Roth 65c52ea24c Merge branch 'remove_fake_resolver' into service_config_json 2016-11-03 09:30:40 -07:00