Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-02 |
|\ | |||
| * | clang-format | David Garcia Quintas | 2016-08-01 |
| * | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | David Garcia Quintas | 2016-08-01 |
| |\ | |||
* | | | Fix exit condition | Vijay Pai | 2016-08-01 |
| | * | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
| | |\ | |||
* | | \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-27 |
|\ \ \ \ | | |/ / | |/| | | |||
| | | * | Merge pull request #7380 from nicolasnoble/no-c++11-threads | Vijay Pai | 2016-07-27 |
| | | |\ | |||
| * | | \ | Merge pull request #7459 from nicolasnoble/udp_test_bitrot | Vijay Pai | 2016-07-27 |
| |\ \ \ \ | |||
| | | * | | | removed some bits from invalid LR design | David Garcia Quintas | 2016-07-26 |
* | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | | |||
| * | | | | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | 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 branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | | | | | |||
| | | | * | | | | | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| | |_|/| | | | | | |/| | | | |/ / | | | | | |/| | | | | | |/| | | | |||
| * | | | | | | | Merge pull request #7488 from ghemawat/slice_user_data | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | 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 |
| | | | | | |\ \ \ \ | |||
| | | * | | | | | | | | Add gpr_slice_new_with_user_data. | Sanjay Ghemawat | 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 |
| | | | | | | * | | | Fixing udp test bitrotting. | Nicolas "Pixel" Noble | 2016-07-19 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||
* / | | | | | | | | Splitting interop_server.cc | Nicolas "Pixel" Noble | 2016-07-18 |
|/ / / / / / / / | |||
| | * / / / / / | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| |/ / / / / / |/| | | | | | | |||
| | | * | | | | Test Python source distribution installation | Masood Malekghassemi | 2016-07-15 |
| | * | | | | | 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 |
| | | | | | | | * | | Simplified LR filter | David Garcia Quintas | 2016-07-13 |
| | | | | | | * | | | 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 pull request #7366 from y-zeng/fix-chttp2-parsing-msg | kpayson64 | 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 |
* | | | | | | | | | | Merge pull request #7044 from yang-g/slice | kpayson64 | 2016-07-13 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ | Merge github.com:grpc/grpc into delayed-write | Craig Tiller | 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 |