Commit Graph

469 Commits

Author SHA1 Message Date
Craig Tiller d48bd078d7 Fixes 2017-10-06 11:25:14 -07:00
Craig Tiller abecd39477 Merge github.com:grpc/grpc into flowctl+millis 2017-10-06 08:46:39 -07:00
Muxi Yan a83cd1c4cc Merge pull request #12772 from muxi/fix-xcode-misalign-warning
Fix Xcode warning of mis-aligned structs
2017-10-05 11:20:54 -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
Yash Tibrewal dabce0a93a macos objC build error 2017-10-04 11:58:02 -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
Muxi Yan 89cf5a4093 Eliminate gRPC-Core umbrella header warning by tweaking module.modulemap and excluding some files for other build systems 2017-10-02 13:19:56 -07:00
Muxi Yan 9ecc215658 Add PB_NO_PACKED_STRUCTS to gRPC-Core 2017-09-29 17:08:59 -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
Jan Tattermusch 5432dd8874 Revert "Allow SerializationTraits to use grpc::ByteBuffer rather than only grpc_byte_buffer" 2017-09-14 17:55:42 +02:00
Vijay Pai 4a4bd1cd2d Merge pull request #12214 from vjpai/cereal_eye_sir
Allow SerializationTraits to use grpc::ByteBuffer rather than only grpc_byte_buffer
2017-09-13 13:43:39 -07:00
Muxi Yan adf6c8145e Merge remote-tracking branch 'upstream/master' into fix-stream-compression-transport-duplicate 2017-09-11 10:04:57 -07:00
Craig Tiller fabb513fe4 Merge 2017-09-08 11:45:11 -07:00
David Garcia Quintas 1faa48ead3 Merge branch 'master' of github.com:grpc/grpc into rename_lr_to_plugin 2017-09-07 15:29:03 -07:00
Vijay Pai 677395558d Allow SerializationTraits to use grpc::ByteBuffer, not just grpc_byte_buffer 2017-09-07 15:18:07 -07:00
Craig Tiller da8a169928 Merge github.com:grpc/grpc into grpc_millis 2017-09-07 14:47:26 -07:00
Mark D. Roth 8941f607d6 Merge pull request #12369 from markdroth/call_combiner
Second attempt at call combiner PR
2017-09-07 14:43:47 -07:00
Craig Tiller 24f30f7ac0 Garbage collect experimental pollers 2017-09-07 10:16:53 -07:00
David Garcia Quintas 0822d331df s/load_reporting/server_load_reporting 2017-09-06 18:18:48 -07:00
Muxi Yan bf5484e785 build_project 2017-09-05 13:46:18 -07:00
Muxi Yan dfccd838ea Merge pull request #12356 from muxi/port-v160
Aggregate port of PRs related to v1.6.0 release
2017-09-05 09:49:04 -07:00
Craig Tiller ee090ec975 Merge github.com:grpc/grpc into wc 2017-09-01 10:30:11 -07:00
Mark D. Roth 764cf04a13 Revert "Revert "Implement call combiner""
This reverts commit bf19961d0a.
2017-09-01 09:00:06 -07:00
Muxi Yan f0a6fd8329 Port #12258 2017-08-31 14:31:03 -07:00
Craig Tiller ccad38227f Merge github.com:grpc/grpc into stats 2017-08-31 12:23:53 -07:00
Craig Tiller 6e739745e2 Fix header location error 2017-08-31 11:22:52 -07:00
Mark D. Roth bf19961d0a Revert "Implement call combiner" 2017-08-29 16:59:07 -07:00
Craig Tiller 03c908fc9e Merge github.com:grpc/grpc into stats 2017-08-29 12:34:10 -07:00
Craig Tiller d9b82bdecb Merge github.com:grpc/grpc into grpc_millis 2017-08-29 12:16:56 -07:00
Mark D. Roth ff4f2db4b9 Merge pull request #11566 from markdroth/call_combiner
Implement call combiner
2017-08-25 09:05:04 -07:00
Mark D. Roth 76e264b8df Implement call combiner. 2017-08-25 09:03:33 -07:00
David Garcia Quintas 3499960070 Renamed load_reporting.{c,h} to load_reporting_plugin.{c,h} 2017-08-24 14:09:47 -07:00
yang-g 9ff6031014 Add sync_custom.h 2017-08-24 09:08:21 -07:00
yang-g 98ad80a815 Remove stale file 2017-08-24 08:59:51 -07:00
David Garcia Quintas 713597f1cd Master version bump to 1.7.x 2017-08-16 20:59:05 -07:00
Muxi Yan e60c0f82b5 Merge pull request #11714 from muxi/port-11712
Port #11712: Fix the nanopb's header include issue
2017-08-15 14:02:03 -07:00
jiangtaoli2016 25d6fd82d1 split tsi library into two 2017-08-09 11:15:04 -07:00
jiangtaoli2016 32f66e8a81 Update build rule 2017-08-07 13:33:37 -07:00