Craig Tiller
|
94fad8119e
|
Tune down number of channels for qps_test
|
2015-07-30 07:55:02 -07:00 |
Craig Tiller
|
dfc42da760
|
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Conflicts:
src/core/iomgr/tcp_server_windows.c
|
2015-07-26 12:37:53 -07:00 |
Yang Gao
|
2a31304d7f
|
Merge pull request #2647 from vjpai/deepend
Dynamic-sized thread pool
|
2015-07-24 23:08:27 -07:00 |
Yang Gao
|
1fedc800dc
|
Merge pull request #2655 from vjpai/expecteq
Switch an int to size_t or else it fails on Mac
|
2015-07-24 21:59:03 -07:00 |
Yang Gao
|
e08cc80ea0
|
Merge pull request #2662 from vjpai/the_isolation_of_nullptr
Isolate nullptr to grpc namespace when we must define it ourselves
|
2015-07-24 21:49:07 -07:00 |
jboeuf
|
5749a3f467
|
Merge pull request #2605 from yang-g/fake_transport_security_to_private
Fake transport security to private
|
2015-07-24 21:30:35 -07:00 |
Vijay Pai
|
d2a9b6da13
|
Isolate nullptr to grpc namespace when we must define it ourselves
Change the one non-namespace use of nullptr to NULL (used as an
argument to a C function anyway)
|
2015-07-25 00:56:33 +00:00 |
vjpai
|
51d22752d6
|
Switch an int to size_t or else it fails on Mac
|
2015-07-24 14:11:04 -07:00 |
Vijay Pai
|
f0c66c6365
|
Merge branch 'master' into deepend
|
2015-07-24 10:51:27 -07:00 |
Vijay Pai
|
67ab91052d
|
Start off with zero reserve threads to make sure that that case works
|
2015-07-23 16:32:25 -07:00 |
Vijay Pai
|
1f3e6c1ebe
|
Start switching everything to dynamic pool
|
2015-07-23 16:18:21 -07:00 |
Craig Tiller
|
dd161a0abd
|
Merge github.com:grpc/grpc into virtuous-velvit-velociraptor
|
2015-07-23 15:30:54 -07:00 |
vjpai
|
b28456b1e4
|
Add dynamic thread pool and initial port of test
|
2015-07-23 14:17:10 -07:00 |
Yang Gao
|
2e7ce15635
|
Merge pull request #2617 from jboeuf/jwt_creds_renaming
Renaming jwt_credentials to service_account_jwt_access_credentials.
|
2015-07-23 13:29:01 -07:00 |
Craig Tiller
|
b256faa353
|
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
|
2015-07-23 11:28:16 -07:00 |
yang-g
|
6f30decf79
|
Flow control fix
|
2015-07-22 23:14:43 -07:00 |
Yang Gao
|
1451f2e919
|
Merge pull request #2571 from vjpai/cent6-issues
Remove one range-based for and do appropriate static casts on nullptr
|
2015-07-22 21:30:00 -07:00 |
Julien Boeuf
|
fe4c3f4f14
|
Renaming jwt_credentials to service_account_jwt_access_credentials.
|
2015-07-22 16:20:13 -07:00 |
yang-g
|
70a1337045
|
merge head and resolve conflict
|
2015-07-22 00:08:06 -07:00 |
yang-g
|
8b25f2aaeb
|
move fake_transport_security_credentials to private API
|
2015-07-21 23:54:36 -07:00 |
Abhishek Kumar
|
b322d4a89e
|
Merge pull request #2427 from yang-g/per_call_oauth_creds_impl
Per call oauth creds impl
|
2015-07-21 16:55:25 -07:00 |
Vijay Pai
|
e66165dead
|
Remove iterator-based test altogether
|
2015-07-21 21:11:38 +00:00 |
Vijay Pai
|
c4af224970
|
Remove one range-based for and do appropriate static casts on nullptr
|
2015-07-21 18:44:20 +00:00 |
Craig Tiller
|
60fb201277
|
Merge github.com:grpc/grpc into now-i-get-to-show-it-to-EVERYBODY
Conflicts:
src/cpp/client/channel_arguments.cc
|
2015-07-20 21:37:13 -07:00 |
yang-g
|
ba5f98081a
|
Merge remote-tracking branch 'upstream/master' into per_call_oauth_creds_impl
|
2015-07-20 09:39:51 -07:00 |
Craig Tiller
|
bf6abeef3d
|
Remove experimental prefix
|
2015-07-19 22:31:04 -07:00 |
Craig Tiller
|
b4fdd32100
|
Merge github.com:grpc/grpc into now-i-get-to-show-it-to-EVERYBODY
Conflicts:
src/cpp/client/channel_arguments.cc
|
2015-07-19 22:26:26 -07:00 |
Craig Tiller
|
b4e70366c6
|
Merge branch 'decompression' of https://github.com/dgquintas/grpc into dgquintas-decompression
Conflicts:
Makefile
vsprojects/Grpc.mak
|
2015-07-19 15:35:17 -07:00 |
Craig Tiller
|
0dc5e6cf16
|
User agent string support
|
2015-07-18 20:39:34 -07:00 |
Craig Tiller
|
8bf2dcab4e
|
Make tests a little more robust
|
2015-07-18 20:39:34 -07:00 |
yang-g
|
5e7e55b957
|
Merge with head and resolve conflict
|
2015-07-17 22:15:12 -07:00 |
Vijay Pai
|
f87a0984ab
|
Merge pull request #2470 from ctiller/i-want-to-wait-free
Lock free requested call fulfillment path
|
2015-07-17 16:05:28 -07:00 |
Nicolas Noble
|
e9881bbaf3
|
Merge pull request #2403 from ctiller/no-worries-i-can-wait
Add a clock_type field to gpr_timespec
|
2015-07-17 15:39:28 -07:00 |
David Garcia Quintas
|
cadbf22467
|
Removed compression levels from clients and _experimental_'d signature of methods manipulating compression algorithms
|
2015-07-17 15:33:13 -07:00 |
Craig Tiller
|
29cb6dd21f
|
Merge pull request #2482 from vjpai/rename_schedule_callback
ThreadPoolInterface::ScheduleCallback --> ThreadPoolInterface::Add
|
2015-07-17 15:30:33 -07:00 |
yang-g
|
463cde7cf9
|
update according to spec change
|
2015-07-17 15:21:39 -07:00 |
Craig Tiller
|
c9fef6f521
|
Merge github.com:grpc/grpc into no-worries-i-can-wait
|
2015-07-17 14:41:12 -07:00 |
Craig Tiller
|
af26143b6f
|
Merge github.com:grpc/grpc into i-want-to-wait-free
|
2015-07-17 14:36:45 -07:00 |
Craig Tiller
|
eec373c555
|
Merge pull request #2413 from dgquintas/interop_sniffer
Introduced InteropContextInspector
|
2015-07-17 11:30:57 -07:00 |
Craig Tiller
|
1eedf268e6
|
Merge pull request #2385 from yang-g/timeout_interop
Add timeout interop test case
|
2015-07-17 11:30:00 -07:00 |
vjpai
|
72a44178e9
|
ThreadPoolInterface::ScheduleCallback --> ThreadPoolInterface::Add
|
2015-07-16 21:44:44 -07:00 |
yang-g
|
fb58d239ef
|
Merge with head
|
2015-07-16 21:03:49 -07:00 |
yang-g
|
7ef7232dd9
|
split iterator into its own file
|
2015-07-16 21:00:51 -07:00 |
David Garcia Quintas
|
7cceb09b79
|
Merge branch 'master' of github.com:grpc/grpc into decompression
|
2015-07-16 17:01:18 -07:00 |
Craig Tiller
|
9a3f858f93
|
Merge pull request #2460 from vjpai/exposed_pool
Make thread_pool.h a public header
|
2015-07-16 16:26:19 -07:00 |
Craig Tiller
|
e0981dfa05
|
Merge github.com:grpc/grpc into i-want-to-wait-free
|
2015-07-16 08:45:15 -07:00 |
vjpai
|
a2e1bb1577
|
Change name of thread_pool files to fixed_size_thread_pool when
appropriate
|
2015-07-15 16:49:49 -07:00 |
David Garcia Quintas
|
6dd49a5c8f
|
Added some methods to context inspector. Also minor tweak to server context IsCancelled() method
|
2015-07-15 14:58:32 -07:00 |
David Garcia Quintas
|
e410986635
|
clang-format'd.
|
2015-07-15 14:10:48 -07:00 |
David Garcia Quintas
|
e0d581b6ad
|
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# include/grpc++/client_context.h
# include/grpc++/server_context.h
# src/cpp/client/client_context.cc
# src/cpp/server/server_context.cc
# vsprojects/Grpc.mak
|
2015-07-15 14:07:18 -07:00 |