Commit Graph

1393 Commits

Author SHA1 Message Date
Nicolas Noble f6aefa3ea6 Merge pull request #7400 from yang-g/ga_branch2
Cherrypick #7319 into v1.0.x
2016-07-21 11:28:44 -07:00
Craig Tiller 77c7f9fd62 Merge pull request #7407 from ctiller/delayed-write
Benchmark fixes
2016-07-19 09:26:04 -07:00
Craig Tiller 5ca7e47493 Merge pull request #6737 from ctiller/delayed-write
Delay beginning most writes until we enter poll()
2016-07-19 09:25:49 -07:00
yang-g 807387641f prevent spurious wake up and unstarted/already shutdown server 2016-07-14 22:59:39 -07:00
yang-g 05573f1692 Make Server::Wait work for async only server. 2016-07-13 22:23:19 -07:00
Sree Kuchibhotla 9181754cd9 Merge branch 'master' into stress_test_metrics_fix 2016-07-07 09:39:45 -07:00
Craig Tiller eda85c6765 Expunge all references to zookeeper 2016-07-01 12:45:19 -07:00
Sree Kuchibhotla d2a4fd4385 Merge branch 'master' into stress_test_metrics_fix 2016-06-30 14:17:51 -07:00
Sree Kuchibhotla 18a0e47970 Fix cout error string 2016-06-29 12:04:09 -07:00
Craig Tiller f0255d4d9c Merge pull request #7095 from ctiller/all_calls_together
Colocate calls for the same channel on the same CQ
2016-06-28 12:27:01 -07:00
Sree Kuchibhotla ad57b266c7 Fix metrics client logging 2016-06-27 20:46:37 -07:00
Jan Tattermusch 11015b43af Merge pull request #7019 from dgquintas/wrong_msg_interop_client_cpp
Fixed error messages for C++ interop client.
2016-06-27 16:21:22 -07:00
Craig Tiller 5b47ac385b Colocate calls for the same channel on the same CQ 2016-06-27 15:47:17 -07:00
David Garcia Quintas 193a5c737f printf portability sucks 2016-06-27 11:30:10 -07:00
Craig Tiller f467846b1b Merge github.com:grpc/grpc into reuse_port 2016-06-26 09:54:53 -07:00
Jan Tattermusch a5cae9bd64 Merge pull request #6798 from jboeuf/fix_3803
Fix #3803
2016-06-24 16:14:02 -07:00
David Garcia Quintas 83a6a828b0 Fixed error messages for C++ interop client. 2016-06-23 11:33:13 -07:00
Craig Tiller d82a5b66c7 Merge github.com:grpc/grpc into reuse_port 2016-06-22 08:08:45 -07:00
David Garcia Quintas 446f70e384 fixed faulty server streaming c++ test case 2016-06-21 17:13:28 -07:00
David Garcia Quintas dacce7a1e1 fixed bad merge. c++ tests should work again 2016-06-21 16:40:20 -07:00
Craig Tiller 04a468122f Add comment 2016-06-21 09:16:57 -07:00
Craig Tiller d263b925e8 Make sure to poll cq 2016-06-21 09:15:57 -07:00
David Garcia Quintas 50c5511a9b Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop 2016-06-17 19:01:03 -07:00
David Garcia Quintas 3c65d24fab updated stress test with new tests cases 2016-06-17 15:18:18 -07:00
Vijay Pai ddf694cc62 Merge branch 'master' into wheezy 2016-06-17 13:41:38 -07:00
Vijay Pai 6ab4788ae9 clang-format changes 2016-06-17 00:31:23 -07:00
David Garcia Quintas 8375c0daea Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop 2016-06-16 18:43:19 -07:00
Jan Tattermusch 3e45ed1c9a Merge pull request #6838 from vjpai/trigger_happy
Revert unneeded change in qps worker
2016-06-16 18:00:25 -07:00
Jan Tattermusch ef03e53938 Merge pull request #6858 from makdharma/issue5851
implement interval_us functionality
2016-06-16 17:59:39 -07:00
David Garcia Quintas 909dd6ec8b Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop 2016-06-16 17:03:40 -07:00
David Garcia Quintas 560875239e c++ client & server changes to bring code up to spec 2016-06-16 16:52:11 -07:00
David Garcia Quintas 34f1b555ae better test_case flag help formating 2016-06-16 16:51:20 -07:00
Vijay Pai b31a9a0900 Include <cinttypes> for PRIuPTR. Not clear why this is needed. 2016-06-16 07:50:20 +00:00
Vijay Pai 6b668cc93f Remove range-based for, comparisons to nullptr 2016-06-16 07:49:36 +00:00
Vijay Pai b9e927afcc Merge branch 'master' into wheezy 2016-06-15 22:57:21 -07:00
Vijay Pai 20bf126da6 clang-format 2016-06-15 22:21:48 -07:00
vjpai e44d53757a De-lambda-ify 2016-06-15 22:15:00 -07:00
Vijay Pai 679c75f0a6 Deal with issues surrounding const members of classes used in
containers
2016-06-15 13:10:32 -07:00
Vijay Pai a63271c77f Deal with to_string, proper usage of nullptr, and lack of map::emplace 2016-06-15 12:56:38 -07:00
Vijay Pai 12bf3801b8 Got carried away with grpc:: 2016-06-15 11:24:10 -07:00
Vijay Pai 08e071abe0 Specify template parent explicitly 2016-06-15 10:58:15 -07:00
Vijay Pai 9aa5f23645 Switch out a using with a typedef 2016-06-15 10:50:23 -07:00
Vijay Pai efa8430e39 Enforce gcc-4.4 compatibility on test_credentials_provider by changing
a map to 2 vectors. Additional minor changes needed (e.g., override->GRPC_OVERRIDE,
nullptr->grpc::nullptr)
2016-06-15 10:23:34 -07:00
Jan Tattermusch 8fb6c924b5 Merge pull request #6875 from y-zeng/log_check
Add format check for gpr_log and gpr_asprintf, add gpr_strpad
2016-06-14 19:31:05 -07:00
Jan Tattermusch 136307756c Merge pull request #6438 from y-zeng/reflection_separate_lib
Proto server reflection
2016-06-13 14:16:06 -07:00
vjpai 97da6473b4 Manual clang-format 2016-06-13 09:56:26 -07:00
Yuchen Zeng bcf5023bb6 Fix zookeeper_test 2016-06-10 16:22:57 -07:00
Yuchen Zeng ed81a88c3e Merge remote-tracking branch 'upstream/master' into log_format_check 2016-06-10 15:46:23 -07:00
Yuchen Zeng beaa35724c Fix type mismatch for type_size 2016-06-10 15:46:14 -07:00
Yuchen Zeng 0ba114408e Fix gpr_log format mismatches in c++ tests 2016-06-10 15:15:44 -07:00