Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 |
|\ | |||
| * | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/ruby/pb/test/client.rb src/ruby/pb/test/server.rb tools/dockerfile/test/php7_jessie_x64/Dockerfile | ||
| | * | Merge pull request #7380 from nicolasnoble/no-c++11-threads | Vijay Pai | 2016-07-27 |
| | |\ | | | | | | | | | Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std::thread. | ||
| * | \ | Merge pull request #7020 from rjshade/assert_not_expect | kpayson64 | 2016-07-25 |
| |\ \ \ | | | | | | | | | | | ASSERT vector size before directly accessing first element | ||
| | | * \ | Merge pull request #7400 from yang-g/ga_branch2 | Nicolas Noble | 2016-07-21 |
| | | |\ \ | | | | | | | | | | | | | Cherrypick #7319 into v1.0.x | ||
| * | | | | | Revert unnecessary deletions | Yuchen Zeng | 2016-07-19 |
| | | | | | | |||
| | | * | | | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Delay beginning most writes until we enter poll() | ||
| * | | | | | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| | | | | | | |||
| | * | | | | Merge branch 'master' into assert_not_expect | Robbie Shade | 2016-07-15 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-07-15 |
|\| | | | | | |||
| | | | * | | prevent spurious wake up and unstarted/already shutdown server | yang-g | 2016-07-14 |
| | | | | | | |||
| * | | | | | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-14 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Delay beginning most writes until we enter poll() | ||
| * | | | | | | prevent spurious wake up and unstarted/already shutdown server | yang-g | 2016-07-14 |
| | | | | | | | |||
| | | | | * | | Make Server::Wait work for async only server. | yang-g | 2016-07-13 |
| | | | |/ / | |||
| | | | | * | Avoid using certain C++11-isms with grpc::thread, as it's not necessarily ↵ | Nicolas "Pixel" Noble | 2016-07-14 |
| | | | |/ | | | | | | | | | | | | | | | | std::thread. | ||
* | | | | | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-07-12 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | Make Server::Wait work for async only server. | yang-g | 2016-07-11 |
| |/ / / | |||
* | | | | Move use of nullptr into grpc namespace, so that the hack in config.h | Mark D. Roth | 2016-07-11 |
| | | | | | | | | | | | | | | | | can be used. | ||
* | | | | Add include to fix gcc-4.4 problem. | Mark D. Roth | 2016-07-11 |
| | | | | |||
| | * | | Better fix for flow control bug | Craig Tiller | 2016-07-07 |
| |/ / | |||
* | | | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-07-01 |
|\ \ \ | |||
| | * | | Expunge all references to zookeeper | Craig Tiller | 2016-07-01 |
| |/ / | |||
* | | | Move channel_filter.h from include/ tree to src/ tree. | Mark D. Roth | 2016-06-29 |
| | | | |||
* | | | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-06-29 |
|\ \ \ | |||
* | | | | Initial attempt at a C++ wrapper for the C grpc_transport_op and | Mark D. Roth | 2016-06-27 |
| | | | | | | | | | | | | | | | | grpc_transport_stream_op structs. | ||
| | * | | Merge github.com:grpc/grpc into reuse_port | Craig Tiller | 2016-06-26 |
| | |\ \ | |||
| | | * | | Merge pull request #6798 from jboeuf/fix_3803 | Jan Tattermusch | 2016-06-24 |
| | |/| | | |/| | | | | | | | | Fix #3803 | ||
| | | | * | ASSERT vector size before directly accessing first element | Robbie Shade | 2016-06-23 |
| | |_|/ | |/| | | |||
| | * | | Add comment | Craig Tiller | 2016-06-21 |
| | | | | |||
| | * | | Make sure to poll cq | Craig Tiller | 2016-06-21 |
| |/ / | |||
| * | | clang-format changes | Vijay Pai | 2016-06-17 |
| | | | |||
* | | | Removed unnecessary comments. Added connection counter to test. | Mark D. Roth | 2016-06-16 |
| | | | |||
* | | | Fix portability issues. | Mark D. Roth | 2016-06-16 |
| | | | |||
* | | | Remove unnecessary code from test. | Mark D. Roth | 2016-06-16 |
| | | | |||
* | | | clang-format | Mark D. Roth | 2016-06-16 |
| | | | |||
* | | | Pass channel args to ChannelData ctor and ChannelData to CallData ctor. | Mark D. Roth | 2016-06-16 |
| | | | |||
* | | | Fixed test. | Mark D. Roth | 2016-06-16 |
| | | | |||
* | | | - fix build problems | Mark D. Roth | 2016-06-16 |
| | | | | | | | | | | | | | | | - make changes suggested by reviewer - add test (not working yet) | ||
| * | | Include <cinttypes> for PRIuPTR. Not clear why this is needed. | Vijay Pai | 2016-06-16 |
| | | | |||
| * | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-15 |
| |\ \ | |/ / |/| | | |||
| * | | clang-format | Vijay Pai | 2016-06-15 |
| | | | |||
| * | | De-lambda-ify | vjpai | 2016-06-15 |
| | | | |||
| * | | Deal with issues surrounding const members of classes used in | Vijay Pai | 2016-06-15 |
| | | | | | | | | | | | | containers | ||
| * | | Deal with to_string, proper usage of nullptr, and lack of map::emplace | Vijay Pai | 2016-06-15 |
| | | | |||
* | | | Merge pull request #6875 from y-zeng/log_check | Jan Tattermusch | 2016-06-14 |
|\ \ \ | | | | | | | | | Add format check for gpr_log and gpr_asprintf, add gpr_strpad | ||
* \ \ \ | Merge pull request #6438 from y-zeng/reflection_separate_lib | Jan Tattermusch | 2016-06-13 |
|\ \ \ \ | | | | | | | | | | | Proto server reflection | ||
| | | * | | Manual clang-format | vjpai | 2016-06-13 |
| | | | | | |||
| | * | | | Fix zookeeper_test | Yuchen Zeng | 2016-06-10 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'upstream/master' into log_format_check | Yuchen Zeng | 2016-06-10 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | * | | | Fix type mismatch for type_size | Yuchen Zeng | 2016-06-10 |
| | | | | |