Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-04 | |
|\ | |||
| * | Merge pull request #5803 from nicolasnoble/what-the-fuzz | 2016-08-03 | |
| |\ | |||
| * | | deflake grpclb_test | 2016-08-02 | |
| * | | Merge pull request #7370 from rjshade/move_timeout_encoding | 2016-08-02 | |
| |\ \ | |||
| | | * | Merge branch 'master' of https://github.com/grpc/grpc into what-the-fuzz | 2016-08-02 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #7024 from markdroth/filter_call_init_failure | 2016-08-02 | |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #7601 from dgquintas/census_stuff | 2016-08-02 | |
| |\ \ \ \ \ | |||
| | | * | | | | Fix destroy_call_elem API in test. | 2016-08-02 | |
| * | | | | | | Merge pull request #7590 from vjpai/affinity_optional | 2016-08-02 | |
| |\ \ \ \ \ \ | |||
| | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-08-02 | |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-02 | |
|\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | * | | | | | | | moar clang-format | 2016-08-01 | |
| | | | * | | | | | Changed census static metadata keys for tracing and tag propagation | 2016-08-01 | |
| | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | clang-format | 2016-08-01 | |
| * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | 2016-08-01 | |
| |\ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||
* | | | | | | | | | Fix exit condition | 2016-08-01 | |
| | | | * | | | | | Don't assert if we're not able to set affinity for some reason | 2016-07-30 | |
| | | |/ / / / / | | |/| | | | | | |||
| | | * | | | | | Addressed the rest of the PR comments | 2016-07-29 | |
| | * | | | | | | Merge branch 'v1.0.x' into manual-upmerge | 2016-07-29 | |
| | |\ \ \ \ \ \ | |||
* | | \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-27 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | | * | | | | | | Merge pull request #7380 from nicolasnoble/no-c++11-threads | 2016-07-27 | |
| | | |\ \ \ \ \ \ | |||
| * | | \ \ \ \ \ \ | Merge pull request #7459 from nicolasnoble/udp_test_bitrot | 2016-07-27 | |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | * | | | | Fixed asan failure and some refcounting bugs. | 2016-07-27 | |
| | | * | | | | | | | | removed some bits from invalid LR design | 2016-07-26 | |
| | | | | | | | * | | | Fix memory overwrite in proto decding; fix test for windows | 2016-07-26 | |
| | | | | | | | | * | | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | |
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
|\| | | | | | | | | | | |||
| * | | | | | | | | | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | 2016-07-25 | |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #7020 from rjshade/assert_not_expect | 2016-07-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | 2016-07-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
|\| | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | | Merge v1.0.x into master | 2016-07-22 | |
| | |_|/| | | | | | | | | | | |/| | | | |/ / / / / / / | | | | | |/| | | | | | | | | | | |/| | | | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #7488 from ghemawat/slice_user_data | 2016-07-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * \ \ | merge to upstream/master | 2016-07-21 | |
| | | | | | | | | | | |\ \ \ | |||
| * | | | | | | | | | | \ \ \ | Merge pull request #7269 from y-zeng/cli_call | 2016-07-21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | | Merge pull request #7400 from yang-g/ga_branch2 | 2016-07-21 | |
| | | | | | |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | * | | | | clang-format | 2016-07-21 | |
| | | * | | | | | | | | | | | | | Add gpr_slice_new_with_user_data. | 2016-07-21 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | Addressed review comments | 2016-07-20 | |
| | | * | | | | | | | | | | | | Add comments for GRPC_NO_GENERATED_CODE | 2016-07-19 | |
| | | * | | | | | | | | | | | | Revert unnecessary deletions | 2016-07-19 | |
| | | | | * | | | | | | | | | | Merge pull request #7407 from ctiller/delayed-write | 2016-07-19 | |
| | | | | * | | | | | | | | | | Merge pull request #6737 from ctiller/delayed-write | 2016-07-19 | |
| | | | | | | | | | | * | | | | Add test filter right before connected channel filter. | 2016-07-19 | |
| | | | | | | | | | | | | * | | Merge branch 'master' into move_timeout_encoding | 2016-07-19 | |
| | | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||
| | | | | | | * | | | | | | | | Fixing udp test bitrotting. | 2016-07-19 | |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||
* / | | | | | | | | | | | | | Splitting interop_server.cc | 2016-07-18 | |
|/ / / / / / / / / / / / / |