Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
|\ | |||
| * | Merge pull request #7380 from nicolasnoble/no-c++11-threads | Vijay Pai | 2016-07-27 |
| |\ | |||
* | \ | Merge pull request #7020 from rjshade/assert_not_expect | kpayson64 | 2016-07-25 |
|\ \ \ | |||
* \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
|\ \ \ \ \ | |||
| | | | * \ | Merge pull request #7400 from yang-g/ga_branch2 | Nicolas Noble | 2016-07-21 |
| | | | |\ \ | |||
| * | | | | | | Addressed review comments | Yuchen Zeng | 2016-07-20 |
| | * | | | | | Add comments for GRPC_NO_GENERATED_CODE | Yuchen Zeng | 2016-07-19 |
| | * | | | | | Revert unnecessary deletions | Yuchen Zeng | 2016-07-19 |
| | | | * | | | Merge pull request #7407 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |
| | | | * | | | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |
| | * | | | | | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| |/ / / / / |/| | | | | | |||
| | * | | | | Merge branch 'master' into assert_not_expect | Robbie Shade | 2016-07-15 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
* | | | | | | Fix compile error | Craig Tiller | 2016-07-15 |
* | | | | | | Merge branch 'histo' of github.com:vjpai/grpc into delayed-write | Craig Tiller | 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 |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #7319 from yang-g/wait_async | kpayson64 | 2016-07-14 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | prevent spurious wake up and unstarted/already shutdown server | yang-g | 2016-07-14 |
| | * | | | | | | | Cleanup from code review | Craig Tiller | 2016-07-14 |
| | | | | | | * | | Make Server::Wait work for async only server. | yang-g | 2016-07-13 |
| | | | | | |/ / | |||
| | | * | | | | | clang-format | Vijay Pai | 2016-07-13 |
| | | * | | | | | Resolve pernicious race between destructor and thread functions by insisting ... | Vijay Pai | 2016-07-13 |
| | | | | | | * | Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std... | Nicolas "Pixel" Noble | 2016-07-14 |
| | | | | | |/ | |||
| | * | | | | | Fix some failures | Craig Tiller | 2016-07-13 |
| | | * | | | | Temporary workaround by setting up a deadline on server shutdown. | Vijay Pai | 2016-07-13 |
| | * | | | | | Merge github.com:grpc/grpc into delayed-write | Craig Tiller | 2016-07-13 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| | | * | | | | Unify and make consistent the per-thread shutdown process | Vijay Pai | 2016-07-13 |
| | * | | | | | Dont stall shutting down server | Craig Tiller | 2016-07-13 |
| | * | | | | | get timeouts working on run_tests.py again | Craig Tiller | 2016-07-13 |
| | * | | | | | Better fine-tuning | Craig Tiller | 2016-07-12 |
| | * | | | | | Get json_run_localhost working again | Craig Tiller | 2016-07-12 |
| | * | | | | | Get json_run_localhost working again | Craig Tiller | 2016-07-12 |
| | * | | | | | Actually run json_run_localhost tests | Craig Tiller | 2016-07-12 |
| | * | | | | | Make request freelists per cq, to allow drastically higher requested call counts | Craig Tiller | 2016-07-12 |
| | * | | | | | Ensure timely response to marks | Craig Tiller | 2016-07-12 |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into slice | yang-g | 2016-07-12 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | Make Server::Wait work for async only server. | yang-g | 2016-07-11 |
| |/ / / / / | |||
| | * | | | | Merge github.com:grpc/grpc into delayed-write | Craig Tiller | 2016-07-11 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | Fix some shutdown errors related to CQ/join ordering | Vijay Pai | 2016-07-08 |
| | | * | | | Merge branch 'verbose_errors' into histo | Vijay Pai | 2016-07-08 |
| | | |\ \ \ | |||
| | | * | | | | Stop holding histogram for a long time | Vijay Pai | 2016-07-08 |
| | | | | * | | Read from stdin | Yuchen Zeng | 2016-07-07 |
| | * | | | | | Fix high seqno tests, up runtimes for benchmark tests to flush more bugs | Craig Tiller | 2016-07-07 |
| | | | | * | | Fix typos | Yuchen Zeng | 2016-07-07 |
| | | | | * | | Update docs | Yuchen Zeng | 2016-07-07 |
| | | | | * | | Support server reflection in CLI | Yuchen Zeng | 2016-07-07 |
| | | | * | | | Add more information so that we can have a meaningful exit code | Vijay Pai | 2016-07-07 |
| | * | | | | | Better fix for flow control bug | Craig Tiller | 2016-07-07 |
| | |/ / / / | |||
| * | | | | | Merge branch 'master' into stress_test_metrics_fix | Sree Kuchibhotla | 2016-07-07 |
| |\| | | | |