David Garcia Quintas
9c97aaed08
Merge branch 'master' of github.com:grpc/grpc into cq_alarm
2015-10-12 21:21:18 -07:00
David Garcia Quintas
7fd0fd5023
C++ Alarm implementation (with tests).
2015-10-07 19:04:58 -07:00
yang-g
b063c87596
mark unreachable code with a macro
2015-10-07 11:40:13 -07:00
David Garcia Quintas
f747bbc043
s/grpc_alarm/grpc_timer && s/grpc_cq_alarm/grpc_alarm
2015-10-04 23:09:47 -07:00
Tim Emiola
25061413cf
Merge pull request #3602 from grpc/release-0_11
...
Upmerge from beta to master.
2015-10-02 13:43:14 -07:00
Jorge Canizales
7069da2fe2
Repeat https://github.com/grpc/grpc/issues/3049 for OSX
2015-09-29 11:29:42 -07:00
Craig Tiller
eff4419b2a
Fixes
2015-09-28 17:18:03 -07:00
Nicolas Noble
f2eb040872
Merge pull request #3544 from ctiller/backtrace-on-crash
...
Enable backtraces on C tests
2015-09-28 10:39:52 -07:00
Craig Tiller
d3366d7ff0
Merge pull request #3497 from nicolasnoble/lost-my-sanity
...
Restoring sanity.
2015-09-28 10:13:10 -07:00
Craig Tiller
2bc37297c8
Enable backtraces on C tests
2015-09-28 10:08:21 -07:00
Yang Gao
bd88711447
Merge pull request #3483 from ctiller/no-tcp-alloc
...
Save some allocations in tcp_posix.c
2015-09-28 09:29:04 -07:00
Nicolas "Pixel" Noble
499fb052a0
Restoring sanity.
2015-09-26 07:07:06 +02:00
Nicolas Noble
0f9a118f4e
Merge pull request #3474 from ctiller/clang_format
...
Add clang-format to sanity
2015-09-25 22:04:11 -07:00
Craig Tiller
0a775b38c7
Merge pull request #2920 from nicolasnoble/winnt-check
...
Better handling of _WIN32_WINNT.
2015-09-25 16:23:15 -07:00
Craig Tiller
dd69342218
Merge github.com:grpc/grpc into clang_format
2015-09-25 09:56:52 -07:00
Craig Tiller
649deebf7f
Recycle partially filled buffers on the next read
2015-09-24 23:19:40 -07:00
Craig Tiller
ddf3a511aa
Add clang-format to sanity
2015-09-24 13:03:44 -07:00
Craig Tiller
04456843cd
Windows fixes
2015-09-23 10:07:16 -07:00
Julien Boeuf
c34b2e744c
Do not use string_ref for output params.
...
It is very much unsafe to do so as the string_ref could point on a stack
variable of the callee.
2015-09-22 13:45:53 -07:00
Julien Boeuf
8b0b6f413d
It is a bad idea to have a map with string_refs as output params.
...
This is very much unsafe as the string_ref could point on a stack
variable of the callee.
2015-09-22 13:31:16 -07:00
Julien Boeuf
14929d4e35
Credentials plugin fixes (after the branch was merged).
2015-09-21 20:57:26 -07:00
Julien Boeuf
97f80faeb4
Adding documentation.
2015-09-15 16:17:31 -07:00
Julien Boeuf
fd2f7331fa
Merge branch 'master' of github.com:grpc/grpc into core_creds_plugin
2015-09-15 15:20:26 -07:00
Craig Tiller
8648c0551f
Merge branch 'immolating-conversion' of github.com:ctiller/grpc into immolating-conversion
2015-09-11 12:59:46 -07:00
Craig Tiller
f29a388207
Merge github.com:grpc/grpc into immolating-conversion
2015-09-11 12:59:27 -07:00
Craig Tiller
ebc7ef268c
Mac build fixes
2015-09-10 22:19:25 -07:00
Craig Tiller
f96dfc3cf8
First round of fixing up implicit 64->32 bit conversions
2015-09-10 14:43:18 -07:00
David Garcia Quintas
49dd250565
Merge branch 'master' of github.com:grpc/grpc into compression-accept-encoding
2015-09-08 16:01:09 -07:00
Nicolas "Pixel" Noble
b70e3be040
Merge branch 'master' of github.com:grpc/grpc into winnt-check
...
Conflicts:
vsprojects/global.props
2015-09-04 19:53:42 +02:00
David Garcia Quintas
328deb28de
Removed grpc_security.h from auth_context.h
2015-09-03 11:33:04 -07:00
Craig Tiller
d6599a39e4
Replicate C++ docs from master to beta branch
...
Original PR #3074 by @dgquintas
2015-09-03 09:37:02 -07:00
Craig Tiller
730118d80f
Merge branch 'third-coming' into endpoints
2015-09-01 07:51:56 -07:00
Julien Boeuf
a7072cbbf7
Merge branch 'master' of github.com:grpc/grpc into core_creds_plugin
2015-08-31 22:26:24 -07:00
Julien Boeuf
2d041188db
Design and implementation of the core credentials plugin API.
...
- We use C++ as an example to show how this API can be used while still
providing an idiomatic interface in the wrapped language of choice.
- No testing yet.
2015-08-31 20:30:09 -07:00
Hongyu Chen
106e15432e
Merge pull request #3107 from a-veitch/view_api
...
API for: defining view and aggregations, associating them with metrics, and retrieving data
2015-08-31 18:15:40 -07:00
Alistair Veitch
1c09accaad
change aggregation_ops to internal type
2015-08-31 16:57:32 -07:00
Craig Tiller
245bd8875b
Merge github.com:grpc/grpc into second-coming
2015-08-31 15:59:13 -07:00
Julien Boeuf
29ee3f40be
Forgot to finish the doc...
2015-08-31 13:27:33 -07:00
Julien Boeuf
6f127029f4
Merge branch 'master' of github.com:grpc/grpc into core_creds_plugin
2015-08-31 13:25:30 -07:00
Julien Boeuf
8b5bb27d34
Adding C API for metadata credentials plugin.
2015-08-31 13:25:21 -07:00
Alistair Veitch
aafe9725b0
scalar -> sum
2015-08-31 13:15:00 -07:00
Alistair Veitch
e41d9d5f93
remove const from data() type
2015-08-31 10:35:32 -07:00
Alistair Veitch
5b61479b0b
rename record fn
2015-08-31 08:43:37 -07:00
Alistair Veitch
c47621fbef
merge
2015-08-31 08:39:47 -07:00
Alistair Veitch
a24148ea38
change aggregation type names
2015-08-31 08:30:32 -07:00
Alistair Veitch
8f691e6c94
add clone to aggregation ops
2015-08-31 08:27:11 -07:00
Julien Boeuf
0d47192afa
Fixing headers and paths after merge with upstream.
2015-08-30 22:18:50 -07:00
Julien Boeuf
d1b6152f88
Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor
2015-08-30 22:01:33 -07:00
Craig Tiller
8c0d6b37a1
Merge pull request #2668 from a-veitch/tracing_api
...
Tracing api
2015-08-30 17:22:33 -07:00
Julien Boeuf
5be92a316d
Shuffling headers around.
2015-08-28 16:28:18 -07:00