Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | 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" | Alexander Polcyn | 2017-04-26 | |
|/ / / | ||||
| * | | 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 | |
| |\ \ \ | ||||
| | * | | | 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 | |
| |\ \ \ | ||||
| * \ \ \ | Merge pull request #10826 from ctiller/ubsan | Craig Tiller | 2017-04-24 | |
| |\ \ \ \ | ||||
| * \ \ \ \ | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 | |
| |\ \ \ \ \ | ||||
* | \ \ \ \ \ | Merge pull request #10764 from makdharma/v1.3.x | makdharma | 2017-04-24 | |
|\ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ | Merge pull request #10796 from danzh2010/udpserver2 | Yang Gao | 2017-04-24 | |
| | |\ \ \ \ \ \ | ||||
| | | | | | * | | | 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 | |
| | |\ \ \ \ \ | ||||
| | * \ \ \ \ \ | Merge pull request #10799 from vjpai/buildhealth | Vijay Pai | 2017-04-24 | |
| | |\ \ \ \ \ \ | ||||
| | | | | | | * | | Threaded port_server | Craig Tiller | 2017-04-24 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||
| | * | | | | | | Merge pull request #10258 from markdroth/service_config_lb_semantics | Mark D. Roth | 2017-04-24 | |
| | |\ \ \ \ \ \ | ||||
| | | | | * | | | | 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 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | Remove more spam | Craig Tiller | 2017-04-21 | |
| | | * | | | | | | | | Remove logging | Craig Tiller | 2017-04-21 | |
| | * | | | | | | | | | Merge pull request #10801 from dgquintas/demote_handshake | David G. Quintas | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #10163 from ctiller/count_now | Craig Tiller | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | Diff now too | Craig Tiller | 2017-04-21 | |
| | | * | | | | | | | | | | Merge github.com:grpc/grpc into count_now | Craig Tiller | 2017-04-21 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | Merge pull request #10777 from ctiller/c++compat1 | Craig Tiller | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10779 from ctiller/c++compat2 | Craig Tiller | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | * | | | | | | | | Fix HTTP proxy tests | Craig Tiller | 2017-04-21 | |
| | | | | | * | | | | | | | | | Demote handshake logging msg to DEBUG | David Garcia Quintas | 2017-04-21 | |
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | doc/interop: Simplify language to fix missed x-user-ip | Eric Anderson | 2017-04-21 | |
| | * | | | | | | | | | | | | doc/interop: Fix link for CacheableUnaryCall | Eric Anderson | 2017-04-21 | |
| | | | | | | | * | | | | | | Avoid duplication in build rules by expanding the grpc_cc_libraries rule-crea... | Vijay Pai | 2017-04-21 | |
| | * | | | | | | | | | | | | Merge pull request #10505 from muxi/move-parsing-queue | Muxi Yan | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | ||||
| | | | | | | | | | | * | | | Add make udp_server shutdown_fd() protected by mutex lock. | Dan Zhang | 2017-04-21 | |
| | * | | | | | | | | | | | | Merge pull request #10639 from vjpai/buildfixes | Vijay Pai | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Fix markdown in README.md | Mehrdad Afshari | 2017-04-21 |