Commit Graph

488 Commits

Author SHA1 Message Date
Nicolas "Pixel" Noble 8302b123de Merge branch 'v1.0.x' into manual-upmerge
Conflicts:
	src/ruby/pb/test/client.rb
	src/ruby/pb/test/server.rb
	tools/dockerfile/test/php7_jessie_x64/Dockerfile
2016-07-29 22:48:16 +02:00
Vijay Pai efef0d29c5 Merge pull request #7380 from nicolasnoble/no-c++11-threads
Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std::thread.
2016-07-27 09:28:15 -07:00
kpayson64 cc961b6c5a Merge pull request #7020 from rjshade/assert_not_expect
ASSERT vector size before directly accessing first element
2016-07-25 14:36:11 -07:00
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
Yuchen Zeng 77b74258b5 Revert unnecessary deletions 2016-07-19 11:53:37 -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
Yuchen Zeng 1318479011 Separate generated file and protobuf dependency 2016-07-18 13:07:42 -07:00
Robbie Shade c51a4833ce Merge branch 'master' into assert_not_expect 2016-07-15 15:06:14 -04:00
yang-g 807387641f prevent spurious wake up and unstarted/already shutdown server 2016-07-14 22:59:39 -07:00
Craig Tiller 13d3e3b7e2 Merge pull request #6737 from ctiller/delayed-write
Delay beginning most writes until we enter poll()
2016-07-14 19:31:47 -07:00
yang-g 6ec11f2acd prevent spurious wake up and unstarted/already shutdown server 2016-07-14 14:53:35 -07:00
yang-g 05573f1692 Make Server::Wait work for async only server. 2016-07-13 22:23:19 -07:00
Nicolas "Pixel" Noble e053e730d2 Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std::thread. 2016-07-14 00:42:07 +02:00
yang-g e89dc6ceb6 Make Server::Wait work for async only server. 2016-07-11 15:48:01 -07:00
Craig Tiller 6c8619bbe7 Better fix for flow control bug 2016-07-07 10:41:48 -07:00
Craig Tiller eda85c6765 Expunge all references to zookeeper 2016-07-01 12:45:19 -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
Robbie Shade 820c1f3fda ASSERT vector size before directly accessing first element 2016-06-23 14:31:28 -04: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
Vijay Pai 6ab4788ae9 clang-format changes 2016-06-17 00:31:23 -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 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
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
Vijay Pai 15855f3e7f Switch server builder plugin API to something that will work with gcc4.4 2016-06-10 12:25:32 -07:00
Yuchen Zeng d23710787b Merge remote-tracking branch 'upstream/master' into reflection_separate_lib 2016-06-07 15:00:52 -07:00
yang-g 000aa457dc add a test with empty request 2016-06-07 13:08:39 -07:00
Jan Tattermusch 570408fd4c Merge pull request #6741 from yang-g/its_ok_to_have_no_read_on_cancelled_call
Let Next set ok=true when receiving error status
2016-06-07 10:54:02 -07:00
Yuchen Zeng 0601df3a04 Move reflection src/hdr to src/cpp/ext include/grpc++/ext 2016-06-06 13:08:06 -07:00
Yuchen Zeng 1495cb5b24 Addressed reveiw comments about naming 2016-06-06 10:58:29 -07:00
Julien Boeuf 38c0cdee34 Fix double-free issue for optional_message.
Also better end to end testing of plumbing of plugin error message.
2016-06-06 14:46:08 +02:00
yang-g 17487f9a22 Make grpc++ independent of protobuf 2016-06-03 15:21:15 -07:00
Jan Tattermusch 2ff798629c Merge pull request #6664 from dklempner/server_builder_plugin_test
Fix a missing initialization
2016-06-02 20:28:39 -04:00
yang-g 15759f610e Let Next set ok=true when receiving error status 2016-06-01 11:21:27 -07:00
Craig Tiller c4c6ecf8e9 Merge github.com:grpc/grpc into test_affine 2016-05-23 12:48:55 -07:00
Craig Tiller bc7593de7a Revert "Revert "Remove spam""
This reverts commit e76528ce26.
2016-05-21 13:05:44 -07:00
Craig Tiller 34c6e87598 Simpler trick to force a listening cq 2016-05-21 13:05:01 -07:00
Craig Tiller e76528ce26 Revert "Remove spam"
This reverts commit 3f3312e7e9.
2016-05-21 12:43:17 -07:00
Craig Tiller 3f3312e7e9 Remove spam 2016-05-21 12:35:29 -07:00