Commit Graph

681 Commits

Author SHA1 Message Date
Nicolas "Pixel" Noble 361f8108e4 Merge branch 'master' of https://github.com/grpc/grpc into upmerge-from-v1.7 2017-11-29 19:31:42 +01:00
Craig Tiller ecd1d5449d Merge github.com:grpc/grpc into no-absl 2017-11-28 13:58:04 -08:00
Mehrdad Afshari d39d007e8f
Merge pull request #13515 from mehrdada/bump-master-version
Bump 1.8.0-dev to 1.9.0-dev
2017-11-28 13:30:54 -08:00
Craig Tiller 84e379ae85 Merge github.com:grpc/grpc into no-absl 2017-11-28 11:38:55 -08:00
Mehrdad Afshari 14e96f9ae8 Bump 1.8.0-dev to 1.9.0-dev 2017-11-27 17:14:15 -08:00
Vijay Pai 891254292e Remove lockfree stack, again 2017-11-22 10:22:28 -08:00
Noah Eisen b8ec238211 Merge branch 'master' of https://github.com/grpc/grpc into inheritance-in-core 2017-11-21 10:12:28 -08:00
Nicolas "Pixel" Noble 18a6837bb0 Merge branch 'v1.7.x' of https://github.com/grpc/grpc 2017-11-21 00:36:21 +01:00
Craig Tiller 348b334f4b Back-out absl dependency for now 2017-11-13 15:16:03 -08:00
ncteisen 0b37f03991 Regenerate projects 2017-11-13 10:03:01 -08:00
ncteisen dd34f3caf6 Inline closure 2017-11-12 20:18:24 -08:00
Alexander Polcyn 9f5163eb85 Bump v1.7.x branch to 1.7.2 2017-11-01 11:07:28 -07:00
Jim King 3e0769957e
Merge pull request #13106 from Vizerai/census_update
Cleaning up census code.
2017-10-31 11:10:00 -07:00
Yuchen Zeng 9e6837d397
Merge pull request #12732 from y-zeng/connectivity_watcher
Client channel backup poller
2017-10-30 14:47:24 -07:00
Yuchen Zeng 0bad30a244 Use backup pollser instead of connectivity watcher 2017-10-30 12:06:52 -07:00
Yuchen Zeng f8ed4fa7f4 convert connectivity_watcher to cpp file 2017-10-30 12:06:52 -07:00
Yuchen Zeng 7269667f9e Add client channel connectivity watcher 2017-10-30 12:04:53 -07:00
Alexander Polcyn 40ba62f2a2 Bump v1.7.x branch to 1.7.1 2017-10-26 20:17:26 -07:00
Mark D. Roth d38a2e89ab Merge remote-tracking branch 'upstream/master' into pick_first_subchannel_list 2017-10-23 12:28:50 -07:00
Vizerai bb7d088ed2 Cleaning up census code. 2017-10-23 12:06:29 -07:00
Nicolas "Pixel" Noble 863a0500df Flagging 1.7.0 2017-10-21 01:48:27 +02:00
Craig Tiller 09247ac453 Merge branch 'pid++' into flow++ 2017-10-18 12:00:37 -07:00
Craig Tiller cb1c0b0973 Merge github.com:grpc/grpc into vector 2017-10-16 11:56:54 -07:00
Craig Tiller 3273648a87 flow control fixes 2017-10-12 22:02:28 -07:00
Ken Payson 9714e0376a Add thread pool reset on fork with FORKING_SUPPORT_ENABLED 2017-10-12 10:22:48 -07:00
Mark D. Roth 0e8cad5bba Merge remote-tracking branch 'upstream/master' into pick_first_subchannel_list 2017-10-12 09:13:15 -07:00
Craig Tiller 5d73d47f64 Merge github.com:grpc/grpc into vector 2017-10-12 08:42:31 -07:00
Craig Tiller 6f2b5f0d22 Fix sanity 2017-10-11 08:20:03 -07:00
Craig Tiller 922260656a C++ize BDP estimator, introduce ManualConstructor 2017-10-08 21:16:12 -07:00
Mark D. Roth 5e9848e7b0 Refactor subchannel_list code out of RR and use it in PF. 2017-10-06 13:59:32 -07:00
Craig Tiller d48bd078d7 Fixes 2017-10-06 11:25:14 -07:00
Craig Tiller 5291023730 Merge github.com:grpc/grpc into flowctl+millis 2017-10-05 10:28:15 -07:00
Craig Tiller 76eab735f4 Merge github.com:grpc/grpc into flowctl+millis 2017-10-05 08:36:34 -07:00
murgatroid99 90e9140211 1.7.x is now 1.7.0-pre1 2017-10-04 14:02:22 -07:00
Yash Tibrewal ec3c138a83 Merge branch 'master' into externC 2017-10-03 16:23:42 -07:00
Yash Tibrewal bc460fa3c4 Rebasing on master for easier merging and testing 2017-10-02 19:01:25 -07:00
murgatroid99 9887379158 Update version to 1.8.0-dev, update g word to 'generous' 2017-10-02 17:31:33 -07:00
Yash Tibrewal 26c78038a5 Trying ken's fix for windows python 2017-10-02 16:34:00 -07:00
Yash Tibrewal a0b96d4f9a Running generate projects 2017-10-02 16:34:00 -07:00
Yash Tibrewal 15ce142d65 Reverting pb.c files for now. Also fixing few more build errors 2017-10-02 16:32:27 -07:00
Yash Tibrewal 83062842c3 Changes for C to C++. Adding extern C to header files for compatibility.
Also converting to .cc
2017-10-02 16:29:41 -07:00
Yash Tibrewal 1c9b584a15 Changes for C to C++. Adding extern C to header files for compatibility. 2017-10-02 16:26:53 -07:00
Craig Tiller 43c1b5f437 Fixes 2017-10-02 14:42:49 -07:00
Craig Tiller 1e868f0f95 Merge github.com:grpc/grpc into flowctl+millis 2017-09-29 11:18:26 -07:00
Muxi Yan 31c66c576a Merge pull request #12399 from muxi/fix-stream-compression-transport-duplicate
Fix stream compression transport duplicate
2017-09-22 14:41:41 -07:00
Craig Tiller cfb2da4445 Merge github.com:grpc/grpc into flowctl+millis 2017-09-22 07:21:12 -07:00
Vijay Pai efce6e1e50 Revert "Revert "Allow SerializationTraits to use grpc::ByteBuffer rather than only grpc_byte_buffer"" 2017-09-21 13:12:52 -07:00
Craig Tiller dd96654721 Merge github.com:grpc/grpc into grpc_millis 2017-09-19 12:31:18 -07:00
Muxi Yan 3f583b7829 Merge remote-tracking branch 'upstream/master' into fix-stream-compression-transport-duplicate 2017-09-19 10:12:25 -07:00
David Garcia Quintas b352be025f Upmerge from v1.6.x branch to master 2017-09-18 11:55:52 -07:00