Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into rr_fixall | David Garcia Quintas | 2016-11-14 |
|\ | |||
* | | Update test_get_channel_info() to use new ch arg syntax | David Garcia Quintas | 2016-11-14 |
| * | Merge pull request #8086 from y-zeng/fix_gprc | Yuchen Zeng | 2016-11-11 |
| |\ | |||
| * \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
| |\ \ | |||
| * \ \ | Merge pull request #8486 from y-zeng/get_tos | Yuchen Zeng | 2016-11-10 |
| |\ \ \ | |||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into ssl_fuzzer | yang-g | 2016-11-09 |
| |\ \ \ \ | |||
| | * | | | | clang-format | Mark D. Roth | 2016-11-09 |
| * | | | | | shutdown is not needed with the changes to mock_ep | yang-g | 2016-11-08 |
| | | | * | | Add grpc_socket_mutator_compare | Yuchen Zeng | 2016-11-08 |
| | * | | | | Clean up end2end_(nosec_)tests | Muxi Yan | 2016-11-08 |
| * | | | | | grpc_slice | yang-g | 2016-11-08 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into ssl_fuzzer | yang-g | 2016-11-08 |
| |\ \ \ \ \ | |||
| | | * | | | | Update with new core | Muxi Yan | 2016-11-08 |
| | | * | | | | Merge remote-tracking branch 'upstream/master' into no-authority-header-in-cr... | Muxi Yan | 2016-11-08 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | Merge pull request #8618 from markdroth/channel_info_api | Mark D. Roth | 2016-11-08 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge github.com:grpc/grpc into securityfuzzit | Craig Tiller | 2016-11-08 |
| | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge branch 'fuzzit' into apifuzzit | Craig Tiller | 2016-11-08 |
| | | | |\ \ \ \ \ \ | |||
| | | | | * \ \ \ \ \ | Merge github.com:grpc/grpc into fuzzit | Craig Tiller | 2016-11-08 |
| | | | | |\ \ \ \ \ \ | |||
| | * | | | \ \ \ \ \ \ | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | Fix sanity | Craig Tiller | 2016-11-08 |
| | * | | | | | | | | | | Merge | Craig Tiller | 2016-11-08 |
| | * | | | | | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| | |\| | | | | | | | | | |||
| | | * | | | | | | | | | Merge pull request #8241 from muxi/core-end2end-tests-cronet-update | Muxi Yan | 2016-11-07 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Merge pull request #8641 from ctiller/more-wtfs | Craig Tiller | 2016-11-07 |
| |_|/| | | | | | | | | | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | clang-format | yang-g | 2016-11-07 |
| | | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into core-end2end-tests-cronet... | Muxi Yan | 2016-11-07 |
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ssl_fuzzer | yang-g | 2016-11-07 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||
| | | | | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into channel_info_api | Mark D. Roth | 2016-11-07 |
| | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Add corpus, the seed examples seem to be merged out | yang-g | 2016-11-04 |
| * | | | | | | | | | | | | Add a fuzzer for ssl server side | yang-g | 2016-11-04 |
* | | | | | | | | | | | | | Merge pull request #8456 from ctiller/pid_ctl | Craig Tiller | 2016-11-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||
| | | * | | | | | | | | | | Make resource_quota a real object | Craig Tiller | 2016-11-04 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||
| | | | | | * | | | | | | Merge github.com:grpc/grpc into fuzzit | Craig Tiller | 2016-11-04 |
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||
| | | | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into channel_info_api | Mark D. Roth | 2016-11-04 |
| | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||
| | | | | | | * | | | | | Fix channel_stack_test. | Mark D. Roth | 2016-11-04 |
* | | | | | | | | | | | | Merge pull request #8537 from markdroth/remove_fake_resolver | Mark D. Roth | 2016-11-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | | | | Code review changes. | Mark D. Roth | 2016-11-04 |
| | | * | | | | | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-04 |
| | | |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Fixed use of unalloc'd memory | David Garcia Quintas | 2016-11-03 |
| * | | | | | | | | | | | | Don't run cancel_after_accept test for fd and socketpair fixtures. | Mark D. Roth | 2016-11-03 |
| | | | | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into channel_info_api | Mark D. Roth | 2016-11-03 |
| | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into remove_fake_resolver | Mark D. Roth | 2016-11-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #8598 from ctiller/rst_stream | Muxi Yan | 2016-11-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | * \ | Merge remote-tracking branch 'upstream/master' into tos | Yuchen Zeng | 2016-11-02 |
| | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Merge remote-tracking branch 'upstream/master' into get_tos | Yuchen Zeng | 2016-11-02 |
| | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Remove GRPC_SOCKET | Yuchen Zeng | 2016-11-02 |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into remove_fake_resolver | Mark D. Roth | 2016-11-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Ensure something executes the new rst_stream code | Craig Tiller | 2016-11-01 |
| | * | | | | | | | | | | | | Fix build problem from merge. | Mark D. Roth | 2016-11-01 |