Commit Graph

181 Commits

Author SHA1 Message Date
Mark D. Roth 1f0f23cc5a Handshaker plugin mechanism. 2017-01-06 13:07:19 -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 0704727c2d Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-27 08:38:35 -08:00
Nathaniel Manista 8f7b0b48bf v1.0.x → master upmerge
Manual changes:

 - Fixed use of Exception.message in _invalid_metadata_test.py

 - Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb

 - Added "set -e" to generate_build_additions.sh
2016-12-16 23:48:52 +00:00
Craig Tiller 6d379a90af Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-12 07:16:03 -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 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
Mark D. Roth 6c3d040ebf Merge branch 'security_handshaker1' into security_handshaker2 2016-11-29 14:24:42 -08:00
Muxi Yan a7f03f6423 Advance objective c version to v1.0.2 2016-11-28 11:29:19 -08:00
Craig Tiller b28c7e8710 Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-11-18 10:29:04 -08:00
Mark D. Roth 071cacf1cb Rename security handshaker files. 2016-11-17 13:17:56 -08:00
Mark D. Roth 8686cab11c Use the same connector code for both secure and insecure clients. 2016-11-17 13:12:17 -08:00
Craig Tiller c586666cbd Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-11-16 15:25:00 -08:00
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
Craig Tiller 7cdad96fc4 Fix foward declaration duplication 2016-11-10 08:37: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
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