Commit Graph

1236 Commits

Author SHA1 Message Date
Vijay Pai 181ef45f5e Addressing outstanding typos and comments
Clang-format of changed files
2015-07-14 13:52:48 -07:00
vjpai df551611d4 Remove reference to nullptr to avoid compiler seeing ambiguity in gcc-4.4
build. The issue is that gcc below 4.6 require us to explicitly define nullptr,
and our explicit definition allows a potential confusion between
nullptr->unique_ptr<string> and
nullptr->char *->grpc::string->unique_ptr<string>
2015-07-14 13:38:44 -07:00
Nicolas "Pixel" Noble e1d95d6e98 Adding a handler for abort().
We want to have a chance to debug a call to abort() in case we have a debugger attached.
2015-07-14 02:08:50 +02:00
Nicolas "Pixel" Noble 717ea0eb74 Install simple Windows exception handlers.
Will prevent Windows tests to display a pop-up message in case of a failure. Essential for Jenkins testing.
2015-07-12 00:01:03 +02:00
Vijay Pai d1c9254029 Merge pull request #2289 from ctiller/footprints-on-the-sands-of-time
Introduce multiple clocks to GPR
2015-07-10 16:43:58 -07:00
Vijay Pai 5c3eea3307 Merge pull request #2380 from ctiller/slartiwhatfast
Make naming a little more consistent
2015-07-10 16:37:41 -07:00
Vijay Pai ad262a1c4a Merge pull request #2384 from ctiller/spiderman-cant-compete
Fix timeout (and probably TSAN builds...)
2015-07-10 16:36:44 -07:00
Vijay Pai 13608fe33f Merge pull request #2347 from ctiller/simpler-cq
Rewrite completion queue
2015-07-10 16:35:35 -07:00
Craig Tiller bd54ec4192 1 != 10 2015-07-10 15:27:44 -07:00
Craig Tiller 2c3a35e5cf Make naming a little more consistent 2015-07-10 14:06:00 -07:00
Yang Gao 57e1f4f818 Merge pull request #2369 from ctiller/mac-be-sadness
Compile fix for Mac
2015-07-10 10:45:26 -07:00
Craig Tiller b7e3633eb6 Merge github.com:grpc/grpc into simpler-cq 2015-07-10 10:43:15 -07:00
Craig Tiller 080d6c50bb Merge github.com:grpc/grpc into footprints-on-the-sands-of-time 2015-07-10 10:23:10 -07:00
Julien Boeuf 0b1b1a5999 Merge branch 'master' of github.com:grpc/grpc into flexible_default_creds 2015-07-10 08:35:04 -07:00
Craig Tiller d0955f36dc Compile fix for Mac 2015-07-10 07:52:37 -07:00
Craig Tiller 5aa65e820b Merge github.com:grpc/grpc into be-less-verbose 2015-07-09 16:45:56 -07:00
Craig Tiller b35fe2a72f Merge branch 'dont-shutdown-your-peers' into simpler-cq 2015-07-09 14:53:14 -07:00
Craig Tiller 12cf537a72 clang-format affected files 2015-07-09 13:48:11 -07:00
Craig Tiller 7d4f8a1d2b Merge github.com:grpc/grpc into simpler-cq 2015-07-09 13:09:16 -07:00
yang-g d53bc8925b Add missing pieces 2015-07-09 12:56:29 -07:00
yang-g 3315a845ef Merge remote-tracking branch 'upstream/master' into security_context2 2015-07-09 12:32:48 -07:00
yang-g f9e8e59b1c Resolve comments 2015-07-09 12:32:15 -07:00
Craig Tiller 5cc175f08e Merge github.com:grpc/grpc into footprints-on-the-sands-of-time 2015-07-09 08:48:35 -07:00
Yang Gao ec5a0ba6ba Merge pull request #2271 from jboeuf/oauth2_access_token
Adding support for raw access token credentials.
2015-07-08 21:48:46 -07:00
Yang Gao 19512b1feb Merge pull request #2320 from ctiller/hosts-need-names-too
Support registering services against specific hosts
2015-07-08 21:47:37 -07:00
Yang Gao d130bdd176 Merge pull request #2308 from ctiller/metadata-wants-to-be-debugged
Add metadata refcount debug helpers
2015-07-08 21:46:52 -07:00
Julien Boeuf a6b9a891a0 Merge branch 'master' of github.com:grpc/grpc into oauth2_access_token 2015-07-08 20:40:13 -07:00
Julien Boeuf ea94e46b0d Merge branch 'master' of github.com:grpc/grpc into jwt_verifier 2015-07-08 16:24:31 -07:00
Craig Tiller 97fc6a3f3f Rewrite completion queue internals to use pre-allocation of events 2015-07-08 15:31:35 -07:00
Julien Boeuf b037bb6488 Adding tests and fixing mem leak in default creds. 2015-07-08 14:58:14 -07:00
Craig Tiller ab54f793ff Reduce spam 2015-07-08 08:34:20 -07:00
Craig Tiller 98d60fcb9a Merge github.com:grpc/grpc into hosts-need-names-too 2015-07-08 07:44:54 -07:00
yang-g ab575d46f7 merge head and resolve conflict 2015-07-07 23:33:40 -07:00
Craig Tiller 3b685b7448 Merge pull request #2200 from jboeuf/slice_to_cstring
Adding util to get a NULL terminated string from a slice.
2015-07-07 21:57:56 -07:00
yang-g 85c04f938f resolve comments 2015-07-07 17:47:31 -07:00
jboeuf 44a4ef3b5a Merge pull request #2174 from nicolasnoble/makefile-npn-check
Adding a check to find NPN-capable OpenSSL.
2015-07-07 16:43:11 -07:00
yang-g e114a01720 Merge remote-tracking branch 'upstream/master' into security_context2 2015-07-07 16:18:36 -07:00
Craig Tiller 822d2c7beb Support registering services against specific hosts 2015-07-07 16:08:00 -07:00
Julien Boeuf 607359467f Merge branch 'master' of https://github.com/grpc/grpc into slice_to_cstring 2015-07-08 01:04:46 +02:00
Craig Tiller c1f7e31502 Merge github.com:grpc/grpc into metadata-wants-to-be-debugged 2015-07-07 13:56:13 -07:00
Craig Tiller 547fed4e8b Merge github.com:grpc/grpc into footprints-on-the-sands-of-time
Conflicts:
	src/core/channel/client_setup.c
	src/core/surface/init.c
2015-07-07 13:52:53 -07:00
yang-g c4eef2eae8 add a test case in end2end_test 2015-07-06 23:26:58 -07:00
Craig Tiller f9899d27f8 Merge github.com:grpc/grpc into tis-but-thy-name 2015-07-06 16:23:19 -07:00
yang-g 8068f86974 Add a unit test 2015-07-06 15:05:48 -07:00
Yang Gao d426864934 Merge pull request #2279 from vjpai/openleaks
qps_test memory leak elimination: delete spare contexts lying around at the end of test
2015-07-06 13:34:25 -07:00
Craig Tiller 1dd7026cd2 Fixup some tests 2015-07-06 11:45:30 -07:00
Craig Tiller f1bff01631 clang-format changed files 2015-07-06 11:20:50 -07:00
Craig Tiller a368bd26d1 Merge github.com:grpc/grpc into footprints-on-the-sands-of-time 2015-07-06 11:04:14 -07:00
Craig Tiller 20b5fe9282 Fixup C++ 2015-07-06 10:43:50 -07:00
Craig Tiller 1a65a234d9 Add metadata refcount debugging 2015-07-06 10:27:57 -07:00