Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 |
|\ | |||
| * | Merge pull request #8618 from markdroth/channel_info_api | Mark D. Roth | 2016-11-08 |
| |\ | |||
| * | | Fix test | Craig Tiller | 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 |
| | |\ \ \ \ \ \ | |||
| | | | | | | | * | Fix C++ filter API and add test for it. | Mark D. Roth | 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 channel_info_api | Mark D. Roth | 2016-11-07 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Increase test timeouts | Craig Tiller | 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 remote-tracking branch 'upstream/master' into service_config_json | 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 |
| | | | |\ \ \ \ \ \ | |||
| * | | | \ \ \ \ \ \ | Merge github.com:grpc/grpc into microbench | Craig Tiller | 2016-11-04 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | Fixed use of unalloc'd memory | David Garcia Quintas | 2016-11-03 |
* | | | | | | | | | | | Merge branch 'remove_fake_resolver' into service_config_json | Mark D. Roth | 2016-11-03 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Don't run cancel_after_accept test for fd and socketpair fixtures. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | | Change value of channel arg to string form, and reparse in each place we use it. | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 |
| | | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into channel_info_api | Mark D. Roth | 2016-11-03 |
| | | | | | | | | | |\ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||
* | | | | | | | | | | | Merge branch 'remove_fake_resolver' into service_config_json | Mark D. Roth | 2016-11-03 |
|\| | | | | | | | | | | |||
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into remove_fake_resolver | Mark D. Roth | 2016-11-03 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||
* | | | | | | | | | | | clang-format | Mark D. Roth | 2016-11-03 |
* | | | | | | | | | | | Add grpc_json_tree to handle refcounting for channel arg. | Mark D. Roth | 2016-11-03 |
|/ / / / / / / / / / | |||
| * | | | | | | | | | Merge pull request #8602 from vjpai/turn_it_to_11 | Vijay Pai | 2016-11-02 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #8598 from ctiller/rst_stream | Muxi Yan | 2016-11-02 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Make new file compliant with new standards | Vijay Pai | 2016-11-02 |
| | | * | | | | | | | | | Merge branch 'master' into turn_it_to_11 | Vijay Pai | 2016-11-02 |
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into remove_fake_resolver | Mark D. Roth | 2016-11-02 |
|\| | | | | | | | | | | | |||
| * | | | | | | | | | | | Merge pull request #8523 from markdroth/lb_policy_name_channel_arg | Mark D. Roth | 2016-11-02 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #8568 from dgquintas/grpclb_leaks_fix | David G. Quintas | 2016-11-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | * | | | | | | | | | Deprecate grpc::thread and sync in favor of std::thread,mutex,etc | Vijay Pai | 2016-11-01 |
| | | | | * | | | | | | | | | Regenerate all projects | Vijay Pai | 2016-11-01 |
| * | | | | | | | | | | | | | Merge pull request #8548 from dgquintas/lb-tokens-length | David G. Quintas | 2016-11-02 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | | | | | clang-format | Vijay Pai | 2016-11-01 |
| | | | | | * | | | | | | | | | Use C++11 final and override | Vijay Pai | 2016-11-01 |