Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | | | | * | | Clean up cq_verifier code. | Mark D. Roth | 2016-08-02 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add Census resource API and implementation. | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #7024 from markdroth/filter_call_init_failure | kpayson64 | 2016-08-02 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Extend filter API to allow call initialization to return an error. | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #7601 from dgquintas/census_stuff | kpayson64 | 2016-08-02 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed census static metadata keys for tracing and tag propagation | |||
| | | | | | | * \ \ \ \ \ | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 | |
| | | | | | | |\ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | ||||
| | | * | | | | | | | | | | Fix destroy_call_elem API in test. | Mark D. Roth | 2016-08-02 | |
| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge pull request #7590 from vjpai/affinity_optional | Vijay Pai | 2016-08-02 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | Don't assert if we're not able to set CPU affinity | |||
| | | | | | | | * | | | | | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 | |
| | | | | | | | |\ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | | | ||||
| | | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-08-02 | |
| | | | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | moar clang-format | David Garcia Quintas | 2016-08-01 | |
| | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Changed census static metadata keys for tracing and tag propagation | David Garcia Quintas | 2016-08-01 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Fix exit condition | Vijay Pai | 2016-08-01 | |
| | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Don't assert if we're not able to set affinity for some reason | Vijay Pai | 2016-07-30 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||
| | | * | | | | | | | | | | Addressed the rest of the PR comments | David Garcia Quintas | 2016-07-29 | |
| | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | 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 branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-07-28 | |
| | | | | | | | | |\ \ \ \ | | | | | | |_|_|_|/ / / / | | | | | |/| | | | | | | | ||||
* | | | | | | | | | | | | | 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 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||
| | | | | | | * | | | | | | | | Fixed asan failure and some refcounting bugs. | Mark D. Roth | 2016-07-27 | |
| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | removed some bits from invalid LR design | David Garcia Quintas | 2016-07-26 | |
| | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | Fix sanity issues | Yuchen Zeng | 2016-07-26 | |
| | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | Fix thread leak | Yuchen Zeng | 2016-07-26 | |
| | | | | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | Fix memory overwrite in proto decding; fix test for windows | Alistair Veitch | 2016-07-26 | |
| | | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 | |
| | | | | | | | | |\ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | Remove references to string_ref_helper | Yuchen Zeng | 2016-07-25 | |
| | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | Merge remote-tracking branch 'upstream/master' into cli_main | Yuchen Zeng | 2016-07-25 | |
| | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | Add header guard | Yuchen Zeng | 2016-07-25 | |
| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | |||
| * | | | | | | | | | | | | | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V1.0.x merge into master | |||
| | | | | | | | | | | | | * | | | Remove unnecessary dependencies | Yuchen Zeng | 2016-07-25 | |
| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | 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 branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 | |
|\| | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | * | | | Command processing, validation | Yuchen Zeng | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gpr_slice_new_with_user_data. | |||
| | | | | | | | | | | * \ \ \ \ \ | merge to upstream/master | Alistair Veitch | 2016-07-21 | |
| | | | | | | | | | | |\ \ \ \ \ \ | ||||
| * | | | | | | | | | | \ \ \ \ \ \ | 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 | |||
| | | | | | | | | | | | | | | | * \ \ | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-07-21 | |
| | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |_|_|_|/ / / | | | | | | | | | | | | |/| | | | | | | ||||
| | | | | | | | | | | | * | | | | | | | clang-format | Mark D. Roth | 2016-07-21 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | |