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
2a31304d7f
Merge pull request #2647 from vjpai/deepend
...
Dynamic-sized thread pool
2015-07-24 23:08:27 -07:00
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
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
51d22752d6
Switch an int to size_t or else it fails on Mac
2015-07-24 14:11:04 -07:00
f0c66c6365
Merge branch 'master' into deepend
2015-07-24 10:51:27 -07:00
1f3e6c1ebe
Start switching everything to dynamic pool
2015-07-23 16:18:21 -07:00
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
6f30decf79
Flow control fix
2015-07-22 23:14:43 -07:00
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
70a1337045
merge head and resolve conflict
2015-07-22 00:08:06 -07:00
8b25f2aaeb
move fake_transport_security_credentials to private API
2015-07-21 23:54:36 -07:00
c4af224970
Remove one range-based for and do appropriate static casts on nullptr
2015-07-21 18:44:20 +00:00
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
bf6abeef3d
Remove experimental prefix
2015-07-19 22:31:04 -07:00
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
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
0dc5e6cf16
User agent string support
2015-07-18 20:39:34 -07:00
8bf2dcab4e
Make tests a little more robust
2015-07-18 20:39:34 -07:00
cadbf22467
Removed compression levels from clients and _experimental_'d signature of methods manipulating compression algorithms
2015-07-17 15:33:13 -07:00
c9fef6f521
Merge github.com:grpc/grpc into no-worries-i-can-wait
2015-07-17 14:41:12 -07:00
7cceb09b79
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-07-16 17:01:18 -07:00
9a3f858f93
Merge pull request #2460 from vjpai/exposed_pool
...
Make thread_pool.h a public header
2015-07-16 16:26:19 -07:00
a2e1bb1577
Change name of thread_pool files to fixed_size_thread_pool when
...
appropriate
2015-07-15 16:49:49 -07:00
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
e845d980e5
Merge pull request #2406 from dgquintas/writeoptions
...
Added WriteOptions for per-message flags and modified CallOps to use it.
2015-07-15 13:40:31 -07:00
69f2410086
Make thread_pool.h a public header
...
Rename ThreadPool -> FixedSizeThreadPool to allow for later introduction
of DynamicSizeThreadPool
2015-07-15 12:33:37 -07:00
181ef45f5e
Addressing outstanding typos and comments
...
Clang-format of changed files
2015-07-14 13:52:48 -07:00
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
6a3cf974f7
Added WriteOptions for per-message flags and modified CallOps to use it.
2015-07-13 13:38:18 -07:00
677c50c92a
Update C++ impl
2015-07-13 10:49:06 -07:00
354398f9f5
Updating wrapped languages to new time functions
2015-07-13 09:16:03 -07:00
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
f0fb537da9
Merge branch 'footprints-on-the-sands-of-time' into no-worries-i-can-wait
2015-07-10 16:04:08 -07:00
080d6c50bb
Merge github.com:grpc/grpc into footprints-on-the-sands-of-time
2015-07-10 10:23:10 -07:00
d0955f36dc
Compile fix for Mac
2015-07-10 07:52:37 -07:00
14ce90ff82
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-07-09 16:18:14 -07:00
3315a845ef
Merge remote-tracking branch 'upstream/master' into security_context2
2015-07-09 12:32:48 -07:00
5cc175f08e
Merge github.com:grpc/grpc into footprints-on-the-sands-of-time
2015-07-09 08:48:35 -07:00
85c04f938f
resolve comments
2015-07-07 17:47:31 -07:00
822d2c7beb
Support registering services against specific hosts
2015-07-07 16:08:00 -07:00
c4eef2eae8
add a test case in end2end_test
2015-07-06 23:26:58 -07:00
20b5fe9282
Fixup C++
2015-07-06 10:43:50 -07:00
8a187099ec
Merge branch 'master' of github.com:grpc/grpc into decompression
...
# Conflicts:
# Makefile
# gRPC.podspec
# src/core/surface/call.c
# src/core/transport/chttp2/frame_data.c
# tools/doxygen/Doxyfile.core.internal
# vsprojects/Grpc.mak
2015-07-01 14:52:44 -07:00
d7d9ce27c5
WIP in *_end2end_test.cc. Tests pass. Fixed leaks and introduced concept of compression request thru MD
2015-06-30 23:29:03 -07:00
0b6ad7d4bc
Bug fix. Do not push to incoming_queue after it is flushed.
2015-06-25 14:39:01 -07:00
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
8cca4694ee
Fix flaky test
...
Assertation could be false if the server responds quickly enough (it's
unlikely to). Removing the assert does not change the nature of the
test.
2015-06-22 13:50:59 -07:00
bf8ac3f406
Merge branch 'you-complete-me' into we-dont-need-no-backup
2015-06-17 09:15:48 -07:00
2622ddbcfd
Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs
...
Conflicts:
include/grpc++/async_unary_call.h
include/grpc++/config.h
include/grpc++/config_protobuf.h
include/grpc++/impl/service_type.h
include/grpc++/stream.h
src/cpp/common/call.cc
2015-06-16 17:30:26 -07:00
Craig Tiller