Commit Graph

1526 Commits

Author SHA1 Message Date
Craig Tiller 4603a1c7a4 Merge pull request #9062 from grpc/revert-9019-short_deadlines
Revert "Handle (and test) short call deadlines"
2016-12-12 07:12:08 -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 70a85ad617 Revert "Handle (and test) short call deadlines" 2016-12-12 06:40:23 -08:00
Jan Tattermusch b62bffbea5 Merge pull request #9026 from jtattermusch/protobuf_consistent_cmake
Make cmake protobuf building consistent with third_party/protobuf
2016-12-12 08:10:11 +01:00
David Garcia Quintas 9460166968 Short deadlines: set Status on deadline 2016-12-09 13:58:24 -08:00
Mark D. Roth 32f35f8576 Merge remote-tracking branch 'upstream/master' into revert-8949-revert-8922-slice_cleanup 2016-12-09 10:55:30 -08:00
Jan Tattermusch e3e2106fad make protobuf building consistent 2016-12-09 11:09:34 +01:00
David Garcia Quintas ff3112188b Renamed google_benchmark submodule to benchmark 2016-12-06 17:44:57 -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 f7a75460ad Merge pull request #8949 from grpc/revert-8922-slice_cleanup
Revert "Remove redundant includes from string.h and tmpfile.h"
2016-12-05 08:06:55 -08:00
Mark D. Roth d101e14211 Revert "Renamed google_benchmark submodule to benchmark" 2016-12-05 08:04:22 -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 746578ac9c Merge pull request #8851 from dgquintas/rename_gbench
Renamed google_benchmark submodule to benchmark
2016-12-05 07:43:17 -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 86a893d52e Merge remote-tracking branch 'upstream/master' into security_handshaker2 2016-11-30 13:23:34 -08:00
Mark D. Roth 2502afbdcb Fixed build.yaml and ran generate_projects.sh. 2016-11-29 15:17:31 -08:00
Mark D. Roth 6c3d040ebf Merge branch 'security_handshaker1' into security_handshaker2 2016-11-29 14:24:42 -08:00
Craig Tiller 3b45b8d60b Revert "Test credentials provider update" 2016-11-29 12:31:14 -08:00
David Garcia Quintas 7d03df3f44 Renamed google_benchmark submodule to benchmark 2016-11-23 19:47:04 -08:00
yang-g 71b275bc10 resolve dependency 2016-11-23 09:42:03 -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
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 1016d9feca Merge github.com:grpc/grpc into bm_fullstack 2016-11-16 14:56:34 -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
Mark D. Roth ad1b395243 Merge remote-tracking branch 'upstream/master' into latency_in_final_info 2016-11-14 12:10:04 -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
Mark D. Roth 7079809a63 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-10 09:41:26 -08:00
yang-g 979abf6747 regenerate projects 2016-11-09 21:52:27 -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
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
Craig Tiller 5910eee262 Merge github.com:grpc/grpc into bm_fullstack 2016-11-08 08:48:23 -08:00
Craig Tiller e6684f415e Remove legacy poller 2016-11-08 08:17:43 -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 31606bdb34 Merge github.com:grpc/grpc into grpc_slice 2016-11-08 07:46:14 -08:00
Craig Tiller b720b609ea Merge github.com:grpc/grpc into grpc_slice 2016-11-08 07:20:27 -08:00
Mark D. Roth 3d88341c54 Populate latency field in final_info. 2016-11-07 13:42:54 -08:00
Mark D. Roth 0e44a258cb Fix C++ filter API and add test for it. 2016-11-07 11:26:05 -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 ed9132427a Get user agent right 2016-11-04 16:31:30 -07:00
Craig Tiller 56fa2c6b56 Order files - things were making sanity sad 2016-11-04 15:19:43 -07: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 cad45939a0 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-04 08:52:30 -07:00
Mark D. Roth 0b48db4bac Merge pull request #8537 from markdroth/remove_fake_resolver
Change tests to use channel args instead of fake_resolver query args.
2016-11-04 08:52:08 -07:00
Craig Tiller 7a4ac73d5b Merge github.com:grpc/grpc into bm_fullstack 2016-11-04 08:44:50 -07:00