aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
Commit message (Collapse)AuthorAge
...
| | | | | | | | * | | | | Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | | |\ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-08-02
| | | | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | moar clang-formatGravatar David Garcia Quintas2016-08-01
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Changed census static metadata keys for tracing and tag propagationGravatar David Garcia Quintas2016-08-01
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | clang-formatGravatar David Garcia Quintas2016-08-01
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16Gravatar David Garcia Quintas2016-08-01
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Fix exit conditionGravatar Vijay Pai2016-08-01
| | | | | | | | | | | | | |
| | | | * | | | | | | | | | Don't assert if we're not able to set affinity for some reasonGravatar Vijay Pai2016-07-30
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Addressed the rest of the PR commentsGravatar David Garcia Quintas2016-07-29
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'v1.0.x' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-07-29
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ruby/pb/test/client.rb src/ruby/pb/test/server.rb tools/dockerfile/test/php7_jessie_x64/Dockerfile
| | | | | | | | | * | | | Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-07-28
| | | | | | | | | |\ \ \ \ | | | | | | |_|_|_|/ / / / | | | | | |/| | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | | * | | | | | | | | | Merge pull request #7380 from nicolasnoble/no-c++11-threadsGravatar Vijay Pai2016-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_bitrotGravatar Vijay Pai2016-07-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing udp test bitrotting.
| | | | | | | * | | | | | | | Fixed asan failure and some refcounting bugs.Gravatar Mark D. Roth2016-07-27
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | removed some bits from invalid LR designGravatar David Garcia Quintas2016-07-26
| | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | Fix sanity issuesGravatar Yuchen Zeng2016-07-26
| | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | Fix thread leakGravatar Yuchen Zeng2016-07-26
| | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | Fix memory overwrite in proto decding; fix test for windowsGravatar Alistair Veitch2016-07-26
| | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-26
| | | | | | | | | |\ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | | | | | | | | | | | * | | Remove references to string_ref_helperGravatar Yuchen Zeng2016-07-25
| | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into cli_mainGravatar Yuchen Zeng2016-07-25
| | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| | | | | | | | | | | | * | | Add header guardGravatar Yuchen Zeng2016-07-25
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile
| * | | | | | | | | | | | | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_masterGravatar Nicolas Noble2016-07-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V1.0.x merge into master
| | | | | | | | | | | | | * | | Remove unnecessary dependenciesGravatar Yuchen Zeng2016-07-25
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #7020 from rjshade/assert_not_expectGravatar kpayson642016-07-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASSERT vector size before directly accessing first element
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7451 from y-zeng/seperate_generated_filesGravatar kpayson642016-07-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
* | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-25
|\| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * | | Command processing, validationGravatar Yuchen Zeng2016-07-25
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge v1.0.x into masterGravatar murgatroid992016-07-22
| | |_|/| | | | | | | | | | | | | | |/| | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #7488 from ghemawat/slice_user_dataGravatar kpayson642016-07-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gpr_slice_new_with_user_data.
| | | | | | | | | | | * \ \ \ \ \ merge to upstream/masterGravatar Alistair Veitch2016-07-21
| | | | | | | | | | | |\ \ \ \ \ \
| * | | | | | | | | | | \ \ \ \ \ \ Merge pull request #7269 from y-zeng/cli_callGravatar kpayson642016-07-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | Support server reflection in CLI
| | | | | | * | | | | | | | | | | | Merge pull request #7400 from yang-g/ga_branch2Gravatar Nicolas Noble2016-07-21
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick #7319 into v1.0.x
| | | | | | | | | | | | | | | | * \ \ Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-07-21
| | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |_|_|_|/ / / | | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | | * | | | | | | clang-formatGravatar Mark D. Roth2016-07-21
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Add gpr_slice_new_with_user_data.Gravatar Sanjay Ghemawat2016-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 commentsGravatar Yuchen Zeng2016-07-20
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Add comments for GRPC_NO_GENERATED_CODEGravatar Yuchen Zeng2016-07-19
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Revert unnecessary deletionsGravatar Yuchen Zeng2016-07-19
| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Merge pull request #7407 from ctiller/delayed-writeGravatar Craig Tiller2016-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Benchmark fixes
| | | | | * | | | | | | | | | | | | Merge pull request #6737 from ctiller/delayed-writeGravatar Craig Tiller2016-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay beginning most writes until we enter poll()
| | | | | | | | | | | | | | | * | | Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-07-19
| | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | |_|_|_|/ / / | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | * | | | | | | Add test filter right before connected channel filter.Gravatar Mark D. Roth2016-07-19
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-19
| | | | | | | | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * Merge branch 'master' into delete_timeout_enumGravatar Robbie Shade2016-07-19
| | | | | | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |