Commit Graph

2213 Commits

Author SHA1 Message Date
Alexander Polcyn f5521c33f9 Revert "Merge branch 'master' into v1.3.x"
This reverts commit 79759fea1a, reversing
changes made to dc36f4df6a.
2017-04-26 14:18:39 -07:00
Yuchen Zeng 79759fea1a Merge branch 'master' into v1.3.x 2017-04-25 11:08:04 -07:00
MakMukhi c090c619c1 Merge pull request #10644 from MakMukhi/master
Added unit testing support.
2017-04-24 16:36:40 -07:00
Craig Tiller 50f7e1aa84 Merge github.com:grpc/grpc into hybrid 2017-04-21 06:38:04 -07:00
Craig Tiller f5a1b75065 Merge pull request #10761 from ctiller/ubsan
Fix ubsan reported failure
2017-04-20 15:03:36 -07:00
Craig Tiller 59db187c85 Merge branch 'tsan-c++' into hybrid 2017-04-20 19:24:57 +00:00
Craig Tiller 56bbe02ca1 Fix ubsan reported failure 2017-04-20 08:37:36 -07:00
Craig Tiller 06a30eef36 Merge github.com:grpc/grpc into cpparena 2017-04-19 14:40:20 -07:00
Yang Gao c63a119fd4 Merge pull request #10682 from yang-g/status_helper
Remove status_helper as it is not needed any more
2017-04-19 10:51:02 -07:00
murgatroid99 9805833776 Add flag to compile gpr with compatibility for musl 2017-04-19 10:25:34 -07:00
Craig Tiller 3588248554 Merge github.com:grpc/grpc into hybrid 2017-04-19 09:06:45 -07:00
Craig Tiller 827b061535 clang-format 2017-04-19 06:49:29 -07:00
Mahak Mukhi ea07b60401 Post-review update 2017-04-18 17:05:49 -07:00
Craig Tiller cac4e178fd Merge github.com:grpc/grpc into cpparena 2017-04-18 13:39:18 -07:00
Craig Tiller a12c0657ef Merge github.com:grpc/grpc into hybrid 2017-04-18 13:23:44 -07:00
Craig Tiller 991c101de8 Initial thread manager fixes 2017-04-18 19:43:14 +00:00
yang-g 6bc701659c Remove status_helper as it is not needed any more 2017-04-18 10:36:36 -07:00
Craig Tiller 1eeed856ee Merge pull request #10237 from meliuz/configurable-minbackoff-reconnect
Make min_backoff_ms timeout configurable
2017-04-18 09:19:30 -07:00
David G. Quintas a6f64f4c00 Merge pull request #10391 from dgquintas/lr_back_to_md
Load Reporting back to using metadata
2017-04-17 10:36:42 -07:00
Yang Gao c5fc2b7112 Merge pull request #10663 from yang-g/globalcallback
Update ServerGlobalCallback::AddPort api
2017-04-17 09:13:49 -07:00
David Garcia Quintas a818f72c0c Load Reporting back to using metadata 2017-04-15 11:25:48 -07:00
Mahak Mukhi c5eee16814 more sanity fixes 2017-04-14 17:02:26 -07:00
David Garcia Quintas 2f4679ea34 Fix handling of slice in http_client_filter 2017-04-14 13:17:19 -07:00
Craig Tiller c3666d7090 Merge github.com:grpc/grpc into hybrid 2017-04-14 13:15:56 -07:00
Craig Tiller 2c6f63731c Merge github.com:grpc/grpc into cpparena 2017-04-14 13:14:10 -07:00
yang-g eafeea48a9 Update ServerGlobalCallback::AddPort api 2017-04-14 12:34:10 -07:00
Craig Tiller 957562780a Merge pull request #10583 from ctiller/server_start
Threading robustness
2017-04-14 08:53:01 -07:00
Sree Kuchibhotla b81fb794a3 Merge pull request #9972 from sreecha/cq_create_api_changes
Completion Queue creation API changes (C-Core and C++ only)
2017-04-14 07:59:18 -07:00
Craig Tiller 58e6d13f1b Merge github.com:grpc/grpc into minimal_test 2017-04-13 20:50:09 -07:00
Sree Kuchibhotla 33f4c6d04a Merge branch 'master' into cq_create_api_changes 2017-04-13 15:39:45 -07:00
Mahak Mukhi b32e89eb8b added todo 2017-04-13 14:55:06 -07:00
Mahak Mukhi 2814b5148e formatting 2017-04-13 14:45:26 -07:00
Julien Boeuf d6547f45d1 Be more explicit about the contract for free_fn in the gpr_allocation_functions doc. 2017-04-13 13:53:36 -07:00
Mahak Mukhi bcf0eb6126 Merge branch 'master' of github.com:grpc/grpc 2017-04-13 13:28:58 -07:00
Craig Tiller a103f7bbdf update comments 2017-04-13 09:25:44 -07:00
Craig Tiller 7c0cbad3f2 Merge github.com:grpc/grpc into minimal_test 2017-04-13 06:51:50 -07:00
Craig Tiller 57e6485e2d Merge github.com:grpc/grpc into hybrid 2017-04-13 06:46:27 -07:00
Sree Kuchibhotla aa5a92800f Merge branch 'master' into cq_create_api_changes 2017-04-13 03:13:17 -07:00
Mahak Mukhi e536eeb6d0 Added tests for uni-directional streaming RPCs. 2017-04-12 17:16:23 -07:00
Mahak Mukhi 31d92d42ff Initial commit: Auto-generate GMOCK code for client stub. 2017-04-12 17:16:23 -07:00
Yang Gao 7f2a15a6f9 Merge pull request #10586 from yang-g/error_details2
Add helper function to supply and parse error_details from Status.
2017-04-12 17:11:02 -07:00
Craig Tiller b3d308b9a1 Merge github.com:grpc/grpc into cpparena 2017-04-12 15:16:35 -07:00
Craig Tiller d946751376 Merge github.com:grpc/grpc into server_start 2017-04-12 15:09:07 -07:00
Craig Tiller 80233bfde5 Merge github.com:grpc/grpc into minimal_test 2017-04-12 14:55:17 -07:00
Craig Tiller 08aea10d02 document 2017-04-12 08:45:36 -07:00
Craig Tiller f0721657ff Merge github.com:grpc/grpc into truebin 2017-04-12 08:41:29 -07:00
Craig Tiller 11c5832b3e Get rid of second api for marking non-listening cqs 2017-04-12 08:21:17 -07:00
Craig Tiller c20fa90c60 Merge github.com:grpc/grpc into cpparena 2017-04-12 06:44:00 -07:00
Craig Tiller 75bfb97548 Finish hybrid server stuff, ensure it gets tested 2017-04-11 17:55:12 -07:00
Craig Tiller 334c4678a3 Start building out C++ interface 2017-04-11 16:26:07 -07:00