Craig Tiller
|
4671122995
|
Merge branch 'you-complete-me' into we-dont-need-no-backup
|
2015-06-09 22:59:31 -07:00 |
Jan Tattermusch
|
9bfedd67e0
|
Merge remote-tracking branch 'upstream/master' into you-complete-me-csharp
|
2015-06-09 17:47:56 -07:00 |
Craig Tiller
|
03764bb828
|
Merge pull request #1971 from endobson/patch-1
Fix typo in grpc_security.h
|
2015-06-09 08:34:46 -07:00 |
Craig Tiller
|
887774dc33
|
Merge pull request #1963 from dgquintas/compression
Made grpc_byte_buffer_reader able to decompress msgs.
|
2015-06-09 07:08:02 -07:00 |
Nicolas Noble
|
b8e1674f07
|
Merge pull request #2000 from dgquintas/extern-c-braces
Added braces to "extern C".
|
2015-06-08 22:42:31 -07:00 |
David Garcia Quintas
|
ca281377c0
|
Added missing compression.h file.
|
2015-06-08 20:11:30 -07:00 |
David Garcia Quintas
|
59f905d79a
|
Changes to byte_buffer based on comments.
|
2015-06-08 20:06:17 -07:00 |
Craig Tiller
|
febf3b0803
|
Merge pull request #1984 from grpc/revert-1980-revert-1948-poisson
Revert "Revert "Open loop sync/async multithreaded testing""
|
2015-06-08 19:47:15 -07:00 |
David Garcia Quintas
|
bea67927f7
|
Added braces to "extern C".
|
2015-06-08 18:45:23 -07:00 |
Nicolas "Pixel" Noble
|
1ed15e287c
|
Properly exporting our C functions to C++.
Also properly including our headers from public headers using <>
|
2015-06-09 02:24:35 +02:00 |
Vijay Pai
|
372fd8791b
|
Revert "Revert "Open loop sync/async multithreaded testing""
|
2015-06-08 13:30:08 -07:00 |
David Garcia Quintas
|
237443faa4
|
Merge branch 'master' of github.com:grpc/grpc into compression
|
2015-06-08 11:20:05 -07:00 |
Eric Dobson
|
a6124ec210
|
Fix typo in grpc_security.h
|
2015-06-08 11:17:42 -07:00 |
Craig Tiller
|
cfef24bb56
|
Merge github.com:grpc/grpc into we-dont-need-no-backup
|
2015-06-08 10:34:15 -07:00 |
Craig Tiller
|
d55636d813
|
Revert "Open loop sync/async multithreaded testing"
|
2015-06-08 10:12:46 -07:00 |
Craig Tiller
|
1207ef5f52
|
Merge github.com:grpc/grpc into we-dont-need-no-backup
|
2015-06-08 08:40:32 -07:00 |
Craig Tiller
|
c170dee3fc
|
Merge pull request #1974 from vjpai/comments-1972
Fix comments about return value of grpc_completion_queue_{next,pluck}
|
2015-06-08 07:37:54 -07:00 |
vjpai
|
1854d77da0
|
Fix comments about return value of grpc_completion_queue_{next,pluck}
|
2015-06-08 01:12:29 -07:00 |
David Garcia Quintas
|
25d02d5637
|
Made grpc_byte_buffer_reader able to decompress msgs.
|
2015-06-05 16:34:33 -07:00 |
Craig Tiller
|
2c42ef3eb3
|
Merge github.com:grpc/grpc into we-dont-need-no-backup
|
2015-06-05 07:09:56 -07:00 |
Craig Tiller
|
8674cb10eb
|
clang-format
|
2015-06-05 07:09:25 -07:00 |
Vijay Pai
|
cf3fb092cc
|
clang-format
|
2015-06-05 03:41:30 -07:00 |
Craig Tiller
|
8a7592acc3
|
Merge remote-tracking branch 'upstream/master' into you-complete-me
|
2015-06-04 20:46:26 -07:00 |
vjpai
|
ca61f5b765
|
Merge branch 'master' into poisson
|
2015-06-04 09:51:28 -07:00 |
Yang Gao
|
491a67bc47
|
Merge pull request #1903 from ctiller/maybe-i-want-to-change-my-mind
Enable runtime configuration of tracers
|
2015-06-04 08:58:19 -07:00 |
Craig Tiller
|
7b6e979f46
|
Merge github.com:grpc/grpc into you-complete-me
|
2015-06-04 08:43:47 -07:00 |
Craig Tiller
|
af7abf92cb
|
Enable runtime configuration of tracers
|
2015-06-03 17:18:58 -07:00 |
Masood Malekghassemi
|
701af6031f
|
Expose gpr_asprintf and gpr_strdup
|
2015-06-03 15:24:24 -07:00 |
Vijay Pai
|
9dc5c15b56
|
Account for time difference in mac and linux
|
2015-06-03 11:34:53 -07:00 |
vjpai
|
afc3ee89ee
|
Merge branch 'master' into poisson
|
2015-06-03 10:13:48 -07:00 |
Craig Tiller
|
669c139a4a
|
Merge pull request #1866 from dgquintas/stack-allocate-bb-reader
Removed grpc_byte_buffer_reader_{create,destroy}.
|
2015-06-02 16:59:00 -07:00 |
Craig Tiller
|
a4b89fed1c
|
Merge github.com:grpc/grpc into you-complete-me
Conflicts:
src/core/iomgr/resolve_address_posix.c
src/core/surface/server.c
|
2015-06-02 16:55:54 -07:00 |
Craig Tiller
|
8cc6f42287
|
Merge github.com:grpc/grpc into we-dont-need-no-backup
|
2015-06-02 16:28:36 -07:00 |
David Garcia Quintas
|
02c677c6cb
|
Reintroduced grpc_byte_buffer_reader_destroy.
As a no-op for the time being.
|
2015-06-02 14:40:07 -07:00 |
vjpai
|
3beb20c3e2
|
Support use of high_res clock in timepoints
|
2015-06-02 13:58:44 -07:00 |
David Garcia Quintas
|
c9516d4e28
|
Fixed memory leak in server_async
|
2015-06-02 13:41:48 -07:00 |
David Garcia Quintas
|
30bd4eb5cc
|
Removed grpc_byte_buffer_reader_{create,destroy}.
Introduced grpc_byte_buffer_init instead. It's now the user's responsibility to
manage memory.
|
2015-06-01 21:20:47 -07:00 |
Craig Tiller
|
14556ecf8c
|
Merge branch 'count-the-things' into we-dont-need-no-backup
Conflicts:
Makefile
src/core/iomgr/pollset_posix.c
src/core/surface/call.c
src/core/surface/channel.c
src/core/surface/server.c
src/python/src/grpc/_adapter/_low_test.py
tools/doxygen/Doxyfile.core.internal
|
2015-06-01 20:31:27 -07:00 |
Craig Tiller
|
795b242251
|
Merge pull request #1857 from yang-g/test
Various minor fixes
|
2015-06-01 20:06:11 -07:00 |
Alistair Veitch
|
980ef7666d
|
change census_context_deserialize signature
|
2015-06-01 14:35:31 -07:00 |
Yang Gao
|
69fe0759be
|
Various minor fixes
|
2015-06-01 14:32:38 -07:00 |
Alistair Veitch
|
f3da552d5b
|
merge with master
|
2015-06-01 13:34:15 -07:00 |
Alistair Veitch
|
269676209e
|
add init checks
|
2015-06-01 10:45:54 -07:00 |
Alistair Veitch
|
9d48ebfdc3
|
address comments
|
2015-06-01 10:01:03 -07:00 |
Craig Tiller
|
aaa03d74ce
|
Merge github.com:grpc/grpc into you-complete-me
|
2015-06-01 08:48:45 -07:00 |
Craig Tiller
|
f29a6c107d
|
Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup
Conflicts:
Makefile
build.json
src/core/security/credentials.c
src/core/security/credentials.h
src/core/surface/call.c
test/core/end2end/tests/request_response_with_payload_and_call_creds.c
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.core
|
2015-05-30 11:11:05 -07:00 |
Julien Boeuf
|
f720bc5428
|
Merge branch 'master' of github.com:grpc/grpc into server_auth_context
|
2015-05-29 15:15:09 -07:00 |
Craig Tiller
|
131b3ed3cb
|
Merge branch 'demon-on-wheels' into we-dont-need-no-cv
|
2015-05-29 07:56:00 -07:00 |
Craig Tiller
|
6ec402b9ea
|
Expand comment
|
2015-05-28 08:36:41 -07:00 |
Craig Tiller
|
e7023612ef
|
Add a test of cmdline usage strings - and make them saner
|
2015-05-28 08:00:14 -07:00 |