Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Update version to 1.3.1 | murgatroid99 | 2017-05-04 |
| | |||
* | Merge pull request #10959 from murgatroid99/node_rollback_protobuf6 | Michael Lumish | 2017-05-03 |
|\ | | | | | Switch Protobuf.js dependency back to version 5 | ||
| * | Fix a bit of documentation that doesn't apply to Protobuf.js 5 | murgatroid99 | 2017-05-02 |
| | | |||
| * | Switch Protobuf.js dependency back to version 5 | murgatroid99 | 2017-05-02 |
|/ | |||
* | Merge pull request #10904 from jtattermusch/nuget_include_sources_and_symbols | Jan Tattermusch | 2017-05-02 |
|\ | | | | | Include sources and symbols in C# nugets | ||
* \ | Merge pull request #10895 from dgquintas/v1.3.x-post-tag-bump | David G. Quintas | 2017-04-28 |
|\ \ | | | | | | | 1.3.0 -> 1.3.1-pre1 | ||
| | * | include sources and symbols in C# nugets | Jan Tattermusch | 2017-04-28 |
| |/ |/| | |||
| * | 1.3.0 -> 1.3.1-pre1 | David Garcia Quintas | 2017-04-27 |
|/ | |||
* | s/1.3.0-pre/1.3.0 | David Garcia Quintas | 2017-04-27 |
| | |||
* | Merge pull request #10884 from matt-kwong/fix_1.3.x_tests | Matt Kwong | 2017-04-27 |
|\ | | | | | Cherry-pick: fix Jenkins testing 1.3.x | ||
* \ | Merge pull request #10825 from murgatroid99/node_only_uv | Michael Lumish | 2017-04-27 |
|\ \ | | | | | | | Remove non-libuv code from Node extension | ||
| | * | Fix C/C++ test filtering | Matt Kwong | 2017-04-27 |
| | | | |||
| | * | Add test filtering to performance pull requests | Matt Kwong | 2017-04-27 |
| | | | |||
| | * | Extend time capping to run_tests_matrix scripts | Craig Tiller | 2017-04-27 |
| |/ |/| | |||
* | | Merge pull request #10847 from matt-kwong/cherry-pick_max_time | Matt Kwong | 2017-04-26 |
|\ \ | | | | | | | Cherry-pick: Allow specifying a maximum run time to run_tests | ||
| | * | Remove extra header from node_grpc.cc | murgatroid99 | 2017-04-26 |
| | | | |||
| | * | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | murgatroid99 | 2017-04-26 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #10871 from apolcyn/revert_merge_from_master_into_13x | David G. Quintas | 2017-04-26 |
|\ \ \ | | | | | | | | | Revert "Merge branch 'master' into v1.3.x" | ||
| * | | | Revert "Merge branch 'master' into v1.3.x" | Alexander Polcyn | 2017-04-26 |
|/ / / | | | | | | | | | | | | | This reverts commit 79759fea1abd09102d38af3e13a84b69e898124b, reversing changes made to dc36f4df6aba60275a31227e1d29c4d20b6cadca. | ||
| * | | Allow specifying a maximum run time to run_tests | Craig Tiller | 2017-04-25 |
| | | | |||
| | * | Clang format | murgatroid99 | 2017-04-25 |
| | | | |||
| | * | Remove another instance of '#ifdef GRPC_UV' from Node extension | murgatroid99 | 2017-04-25 |
| | | | |||
| | * | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | murgatroid99 | 2017-04-25 |
| | |\ | |_|/ |/| | | |||
* | | | Merge branch 'master' into v1.3.x | Yuchen Zeng | 2017-04-25 |
|\ \ \ | |||
| | | * | Remove another from Node extension | murgatroid99 | 2017-04-25 |
| | | | | |||
| | | * | Removed another couple of uses of '--iomgr_platform=uv' | murgatroid99 | 2017-04-25 |
| | | | | |||
| * | | | Merge pull request #10844 from ctiller/PSC | Craig Tiller | 2017-04-25 |
| |\ \ \ | | | | | | | | | | | Fixes for test stability (especially microbenchmarks) | ||
| | * | | | Ensure port server can shutdown | Craig Tiller | 2017-04-25 |
| | | | | | |||
| | * | | | Ensure port server running | Craig Tiller | 2017-04-25 |
| | | | | | |||
| | * | | | Recycle ports | Craig Tiller | 2017-04-25 |
| | | | | | |||
| | * | | | Be resilient against failed runs | Craig Tiller | 2017-04-25 |
| | | | | | |||
| | * | | | Allow a longer fetch time for port server | Craig Tiller | 2017-04-25 |
| |/ / / | |||
| * | | | Merge pull request #10822 from ctiller/threaded_port_server | Craig Tiller | 2017-04-24 |
| |\ \ \ | | | | | | | | | | | Threaded port_server | ||
| * \ \ \ | Merge pull request #10826 from ctiller/ubsan | Craig Tiller | 2017-04-24 |
| |\ \ \ \ | | | | | | | | | | | | | Slow down timers for ubsan builds | ||
| * \ \ \ \ | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added unit testing support. | ||
* | \ \ \ \ \ | Merge pull request #10764 from makdharma/v1.3.x | makdharma | 2017-04-24 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | disable mongoose on v1.3.x | ||
| | * \ \ \ \ \ | Merge pull request #10796 from danzh2010/udpserver2 | Yang Gao | 2017-04-24 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add lock to shutdown_fd() callback in udp_server.c | ||
| | | | | | * | | | Add a mutex around allocate_port | Craig Tiller | 2017-04-24 |
| | | | | | | | | | |||
| | | | | * | | | | Slow down timers for ubsan builds | Craig Tiller | 2017-04-24 |
| | | |_|/ / / / | | |/| | | | | | |||
| | | | | | | * | Remove non-libuv code from Node extension | murgatroid99 | 2017-04-24 |
| |_|_|_|_|_|/ |/| | | | | | | |||
| | * | | | | | Merge pull request #10584 from ctiller/hybrid | Craig Tiller | 2017-04-24 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Hybrid CQ support | ||
| | * \ \ \ \ \ | Merge pull request #10799 from vjpai/buildhealth | Vijay Pai | 2017-04-24 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Avoid duplication in Bazel rules by using grpc_cc_libraries rule-creator | ||
| | | | | | | * | | Threaded port_server | Craig Tiller | 2017-04-24 |
| | | |_|_|_|/ / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #10258 from markdroth/service_config_lb_semantics | Mark D. Roth | 2017-04-24 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix semantics of LB policy selection. | ||
| | | | | * | | | | Rollback some changes | Craig Tiller | 2017-04-24 |
| | | | | | | | | | |||
| | | | | * | | | | Rollback some changes | Craig Tiller | 2017-04-24 |
| | | | | | | | | | |||
| | | | | * | | | | Merge branch 'hybrid' of github.com:ctiller/grpc into hybrid | Craig Tiller | 2017-04-24 |
| | | | | |\ \ \ \ | |||
| | | | | * \ \ \ \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-24 |
| | | | | |\ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #10802 from ctiller/proxy | Craig Tiller | 2017-04-22 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix HTTP proxy tests | ||
| | | * | | | | | | | | Remove more spam | Craig Tiller | 2017-04-21 |
| | | | | | | | | | | |