Commit Graph

404 Commits

Author SHA1 Message Date
David Garcia Quintas f31f096274 Use call context to propagare LR costs 2017-02-13 16:26:00 -08:00
Jim King 2e096b0fec Merge pull request #9371 from Vizerai/tracing_API
Tracing API
2017-02-08 12:16:35 -08:00
David Garcia Quintas 012915045f Secure naming support for gRPCLB 2017-02-07 17:41:57 -08:00
Craig Tiller 3a63d4c005 Merge github.com:grpc/grpc into bwest 2017-02-01 15:27:24 -08:00
Craig Tiller 5cad46e218 Bump master version numbers 2017-01-30 15:32:24 -08:00
Craig Tiller 95ccbc2d6f Merge branch 'bm_countwrites' into bwest 2017-01-27 14:10:09 -08:00
Vizerai 29053ec89c Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API 2017-01-27 13:11:12 -08:00
Craig Tiller 48af8b2721 Merge github.com:grpc/grpc into bwest 2017-01-26 13:58:52 -08:00
Vizerai e0cd44aa01 Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API 2017-01-26 13:26:30 -08:00
Craig Tiller c63aaf1650 Merge branch 'cp' into rollfwd 2017-01-26 08:51:30 -08:00
Mark D. Roth 6f690f3483 Merge pull request #9372 from markdroth/proxy_mapper
Add proxy mapper hook.
2017-01-25 10:42:34 -08:00
Mark D. Roth 674fe85d11 Merge pull request #9383 from markdroth/http_connect_channel_arg
Trigger HTTP CONNECT handshaker via channel args.
2017-01-25 10:41:18 -08:00
Craig Tiller 7c70b6c144 Revert "Revert "Metadata handling rewrite""
This reverts commit 5e01e2ac97.
2017-01-23 07:48:42 -08:00
Craig Tiller 5e01e2ac97 Revert "Metadata handling rewrite" 2017-01-20 18:11:52 -08:00
Nicolas Noble 2e225c1d80 Merge pull request #9340 from stanley-cheung/update-boringssl
Update boringssl
2017-01-20 15:50:34 -08:00
Vizerai 0e5b67f4a2 update 2017-01-20 14:02:18 -08:00
Craig Tiller ff1f160a26 Merge github.com:grpc/grpc into bwest 2017-01-20 13:55:35 -08:00
Stanley Cheung b39942f06f Update boringssl to latest chromium-stable 2017-01-20 11:07:08 -08:00
Mark D. Roth d58a985a56 Move detection of HTTP CONNECT proxy from DNS resolver to client channel. 2017-01-18 08:28:57 -08:00
Craig Tiller 5acc826ace Merge github.com:grpc/grpc into metadata_filter 2017-01-17 17:20:14 -08:00
Mark D. Roth 79f2a24644 Add proxy mapper hook. 2017-01-17 14:13:33 -08:00
Stanley Cheung c16080c310 Merge pull request #9350 from stanley-cheung/php-update
PHP: Prepare for 1.1.0 release
2017-01-17 14:04:18 -08:00
Stanley Cheung 4242075c33 PHP: Prepare for 1.1.0 release 2017-01-13 15:23:11 -08:00
Mark D. Roth e6bcd0ebc9 Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup 2017-01-13 11:23:01 -08:00
Craig Tiller d425712427 Merge github.com:grpc/grpc into bwest 2017-01-13 09:33:57 -08:00
Craig Tiller 2d9f8e8179 Fix build 2017-01-10 08:48:48 -08:00
Craig Tiller d04dc4da81 Merge github.com:grpc/grpc into fix_errors 2017-01-09 14:40:28 -08:00
Craig Tiller 732351f826 Start fixing http error --> grpc status conversion 2017-01-06 14:52:01 -08:00
Mark D. Roth 1f0f23cc5a Handshaker plugin mechanism. 2017-01-06 13:07:19 -08:00
Mark D. Roth 348fba2809 Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup 2017-01-06 11:07:30 -08:00
Craig Tiller 293ef1572b Merge github.com:grpc/grpc into slice_with_exec_ctx 2017-01-04 15:38:44 -08:00
Craig Tiller 3ca6019d39 Merge branch 'patchy' into slice_with_exec_ctx_and_build 2017-01-04 14:41:29 -08:00
Nicolas "Pixel" Noble 3d5592cea8 Moving message_size_filter properly. 2017-01-04 23:23:40 +01:00
Craig Tiller eb30c809cf Merge branch 'flow_control_v2' into bwest 2016-12-27 16:03:43 -08:00
Craig Tiller 1b0d2f008b Merge branch 'slice_with_exec_ctx' into metadata_filter 2016-12-12 07:19:55 -08:00
Craig Tiller 6d379a90af Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-12 07:16:03 -08:00
Mark D. Roth 4d2ea02129 Revert "Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h"""" 2016-12-12 07:12:27 -08:00
Craig Tiller 30268a99e0 Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" 2016-12-12 06:48:30 -08:00
Craig Tiller b995e8bcda Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-12 06:36:43 -08:00
Craig Tiller 385dd9a462 Merge branch 'slice_interning' into metadata_filter 2016-12-06 20:27:38 -08:00
Craig Tiller 35769dc29c Merge branch 'slice_with_exec_ctx' into slice_interning 2016-12-06 20:23:13 -08:00
Craig Tiller 30d50fed6d Fix build 2016-12-06 19:34:32 -08:00
Craig Tiller 397bff36b9 Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-06 15:05:59 -08:00
Mark D. Roth 2d317fbc57 Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" 2016-12-05 08:07:13 -08:00
Mark D. Roth 4eec0041f5 Revert "Remove redundant includes from string.h and tmpfile.h" 2016-12-05 08:03:41 -08:00
Mark D. Roth adc3fbc0a3 Merge pull request #8922 from sreecha/slice_cleanup
Remove redundant includes from string.h and tmpfile.h
2016-12-05 07:43:40 -08:00
Mark D. Roth 714038204a Use the same server code for both secure and insecure servers. 2016-12-02 10:51:39 -08:00
Sree Kuchibhotla f989469fe3 Temporarily enable gpr_slice_* functions to not break api compatibility 2016-12-01 17:09:35 -08:00
Craig Tiller 369ddc524a Merge branch 'slice_with_exec_ctx' into slice_interning 2016-11-30 13:32:18 -08:00
Mark D. Roth 6c3d040ebf Merge branch 'security_handshaker1' into security_handshaker2 2016-11-29 14:24:42 -08:00