Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 #7459 from nicolasnoble/udp_test_bitrot | Vijay Pai | 2016-07-27 |
|\ \ \ | | | | | | | | | Fixing udp test bitrotting. | ||
* \ \ \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
|\ \ \ \ | | | | | | | | | | | V1.0.x merge into master | ||
* \ \ \ \ | Merge pull request #7020 from rjshade/assert_not_expect | kpayson64 | 2016-07-25 |
|\ \ \ \ \ | | | | | | | | | | | | | ASSERT vector size before directly accessing first element | ||
* \ \ \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf | ||
| | | * | | | | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| |_|/| | | | |/| | | |/ / | | | |/| | | |||
* | | | | | | Merge pull request #7488 from ghemawat/slice_user_data | kpayson64 | 2016-07-21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add gpr_slice_new_with_user_data. | ||
* \ \ \ \ \ \ | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Support server reflection in CLI | ||
| | | | | * \ \ | Merge pull request #7400 from yang-g/ga_branch2 | Nicolas Noble | 2016-07-21 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | Cherrypick #7319 into v1.0.x | ||
| | * | | | | | | | Add gpr_slice_new_with_user_data. | Sanjay Ghemawat | 2016-07-21 |
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpr_slice_new_with_user_data is like gpr_slice_new, but allows the caller to specify a distinct pointer to pass to the destroy function. This is useful when the data is part of a larger data structure that should be destroyed when the data is no longer needed. | ||
| * | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark fixes | ||
| | | | * | | | | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay beginning most writes until we enter poll() | ||
| | | | | | * | | Fixing udp test bitrotting. | Nicolas "Pixel" Noble | 2016-07-19 |
| |_|_|_|_|/ / |/| | | | | | | |||
| | * | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Delay beginning most writes until we enter poll() | ||
* \ \ \ \ \ \ \ | Merge pull request #7319 from yang-g/wait_async | kpayson64 | 2016-07-14 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make Server::Wait work for async only server. | ||
| * | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that destructor is invoked after the class has gone back to being a harmless single-threaded thing. | ||
| | | | | | | * | Avoid using certain C++11-isms with grpc::thread, as it's not necessarily ↵ | Nicolas "Pixel" Noble | 2016-07-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | std::thread. | ||
| | * | | | | | | Fix some failures | Craig Tiller | 2016-07-13 |
| | | | | | | | | |||
| | | * | | | | | Temporary workaround by setting up a deadline on server shutdown. | Vijay Pai | 2016-07-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reveals an issue that needs to be solved: D0713 14:48:28.049861213 14503 server.c:704] Waiting for 44 channels and 0/1 listeners to be destroyed before shutting down server | ||
| | | | | | * | | Merge pull request #7366 from y-zeng/fix-chttp2-parsing-msg | kpayson64 | 2016-07-13 |
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | Remove unnecessary "Failed parsing HTTP2" detail | ||
| | * | | | | \ \ | 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 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add API to get C slice from C++ Slice. | ||
| | | * \ \ \ \ \ \ | 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 |
| | | | | | | | | | | |||
| | | * | | | | | | | Better fine-tuning | Craig Tiller | 2016-07-12 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #7248 from yang-g/server_test | kpayson64 | 2016-07-12 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Initialize variable. | ||
| | | | | | | | * | | | Use test roots.pem in test | yang-g | 2016-07-13 |
| | | | | | | | | |/ | | | | | | | | |/| | |||
| | | | * | | | | | | 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 github.com:grpc/grpc into delayed-write | Craig Tiller | 2016-07-12 |
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | | | |||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into slice | yang-g | 2016-07-12 |
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | |