Commit Graph

624 Commits

Author SHA1 Message Date
Alistair Veitch 4d1589ace0 add record_stat API 2015-07-17 15:13:04 -07:00
Vijay Pai 94fd462df8 override and final 2015-07-14 16:18:41 -07:00
Vijay Pai 181ef45f5e Addressing outstanding typos and comments
Clang-format of changed files
2015-07-14 13:52:48 -07:00
vjpai 7d980e44b2 Remove lambda function with lambda capture to allow building with pre-lambda
compilers
2015-07-14 10:38:30 -07: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
Nicolas Noble 65153e92a8 Merge pull request #2368 from ctiller/they-gave-me-a-badge
Add a version string and a function to retrieve it
2015-07-10 16:16:17 -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 2e622bc16a Add a version string and a function to retrieve it 2015-07-10 07:46:03 -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
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 b037bb6488 Adding tests and fixing mem leak in default creds. 2015-07-08 14:58:14 -07:00
Craig Tiller b09caa967d Remove extraneous explicit 2015-07-08 07:53:47 -07:00
Craig Tiller 2ee8f0b978 Update comments 2015-07-08 07:53: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 fab2764413 Merge pull request #2242 from a-veitch/external_api_2
add client side census context
2015-07-07 21:46:10 -07:00
yang-g 85c04f938f resolve comments 2015-07-07 17:47:31 -07:00
Craig Tiller d9b6fcfee4 Support older compilers 2015-07-07 16:28:20 -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
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 5ea46ab248 merge with upstream and resolve conflicts 2015-07-06 14:05:54 -07:00
yang-g 3abe60b9d0 compiles 2015-07-06 14:00:36 -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 bdfd8976e1 Merge github.com:grpc/grpc into tis-but-thy-name 2015-07-06 07:10:34 -07:00
Craig Tiller d1dd3a68a2 Merge pull request #2117 from dgquintas/bb_from_bbreader
Introduced function to create byte buffers from the output of a byte buffer reader.
2015-07-05 13:30:39 -07:00
Craig Tiller f3756c1e0d Introduce multiple clocks to GPR 2015-07-01 17:21:01 -07:00
Craig Tiller ae65f1a212 Remove random includes of windows.h
Instead, include a stanza in port_platform.h that:
- gets windows.h included
- defines things that we needs to define
- tries to respect applications configurations by leaving things as
untouched as possible
2015-07-01 11:23:59 -07:00
Julien Boeuf 2805be1aa5 Adding support for raw access token credentials. 2015-07-01 02:47:18 -07:00
Alistair Veitch e2aa487936 review changes 2015-07-01 02:00:32 -07:00
Craig Tiller 079a11bb9b clang-format affected files 2015-06-30 10:07:15 -07:00
Craig Tiller 11bf14ec33 Trip through transient failure on disconnection 2015-06-29 16:35:41 -07:00
Alistair Veitch fc62dddd1c add client side census context 2015-06-29 02:52:46 -07:00
Craig Tiller 1107558558 Merge github.com:grpc/grpc into tis-but-thy-name 2015-06-28 16:03:51 -07:00
Masood Malekghassemi b70b70956d Clarify caller contract for grpc_call_start_batch 2015-06-26 16:25:11 -07:00
Craig Tiller 3f475422ec chop chop chop 2015-06-25 10:43:05 -07:00
Craig Tiller 6e8c7e87ef Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-25 08:52:40 -07:00
Craig Tiller d13794332c Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-24 08:48:14 -07:00
Nicolas "Pixel" Noble d8c04b3603 std::function is no longer implicitly included. Fixing this. 2015-06-24 02:33:08 +02:00
yang-g adfed03146 Add missing headers to build.json 2015-06-23 13:01:22 -07:00
Yang Gao 253aaa6b10 Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs
Remove Protobuf dependency for C++
2015-06-23 10:05:20 -07:00
Craig Tiller 949b6ee796 Merge github.com:grpc/grpc into oops-i-split-it-again 2015-06-23 09:26:21 -07:00
Craig Tiller f8fedc43d7 Merge pull request #2141 from murgatroid99/core_support_conversion_warnings
Fix integer conversion warnings in src/core/support
2015-06-23 09:21:11 -07:00
Craig Tiller aa555df7ee Merge pull request #2175 from yang-g/constness
Add const to ByteBuffer methods and add tests
2015-06-23 07:54:19 -07:00