Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
| | * | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 |
| | |\ | |||
| | * \ | Merge pull request #10796 from danzh2010/udpserver2 | Yang Gao | 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 #10258 from markdroth/service_config_lb_semantics | Mark D. Roth | 2017-04-24 |
| |\ \ \ \ | |||
| | | * \ \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-24 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #10801 from dgquintas/demote_handshake | David G. Quintas | 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 |
| | |\ \ \ \ \ \ \ | |||
| | | | | * | | | | | Demote handshake logging msg to DEBUG | David Garcia Quintas | 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 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge pull request #10775 from yang-g/http2_client | Yang Gao | 2017-04-21 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #10742 from markdroth/hash_table | Mark D. Roth | 2017-04-21 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||
| | | | | | | | | * | | | Merge remote-tracking branch 'upstream/master' into service_config_lb_semantics | Mark D. Roth | 2017-04-21 |
| | | | | | | | | |\ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||
| | | | | | | | * | | | | Merge github.com:grpc/grpc into c++compat1 | Craig Tiller | 2017-04-21 |
| | | | | | | | |\ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||
| | | | | | | * | | | | | Merge github.com:grpc/grpc into c++compat2 | Craig Tiller | 2017-04-21 |
| | | | | | | |\ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | Merge pull request #10771 from ncteisen/yet-another-error-refcount-bug | Noah Eisen | 2017-04-21 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-21 |
| | | | | | | | | | | |\ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #10757 from jtattermusch/csharp_prevent_reuseport_v13x | Jan Tattermusch | 2017-04-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #10756 from jtattermusch/csharp_prevent_reuseport | Jan Tattermusch | 2017-04-21 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | | | | | | Fix nit | Muxi Yan | 2017-04-20 |
| | | * | | | | | | | | | | | | Merge pull request #10739 from muxi/fix-unpaired-benchmark | Muxi Yan | 2017-04-20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into yet-another-error-... | Noah Eisen | 2017-04-20 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | | | C++ compatibility fix for stack_lockfree.c | Craig Tiller | 2017-04-20 |
| | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | |||
| | | | | | | | | | | * | | | | C++ compatibility fix for tmpfile_posix.c | Craig Tiller | 2017-04-20 |
| | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | |||
| | | | | | | | | * | | | | | Changes required to make build possible: create separate grpc++_base{,_unsecu... | Vijay Pai | 2017-04-20 |
| | | | | | | | | * | | | | | One more use of incorrect submodule name | Vijay Pai | 2017-04-20 |
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |||
| | | | | | | | * | | | | | Fix http2_interop test for c++ and python | yang-g | 2017-04-20 |
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | |||
| | | | | | * | | | | | | Fix error refcount bug | Noah Eisen | 2017-04-20 |
| | | | | | | | | | * | | Merge branch 'tsan-c++' into hybrid | Craig Tiller | 2017-04-20 |
| | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | Merge pull request #10182 from ctiller/cpparena | Craig Tiller | 2017-04-20 |
| | | |\ \ \ \ \ \ \ \ \ | |||
* | | | \ \ \ \ \ \ \ \ \ | Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibility | Michael Lumish | 2017-04-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ | Merge pull request #10748 from murgatroid99/upmerge_v1.3.x | Michael Lumish | 2017-04-20 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #10450 from vjpai/framer | Vijay Pai | 2017-04-20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10747 from vjpai/dedebug | Vijay Pai | 2017-04-20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | * | | | | | clang-format | Mark D. Roth | 2017-04-20 |
| | * | | | | | | | | | | | | | | | eliminate crosstalk between C# tests | Jan Tattermusch | 2017-04-20 |
| | * | | | | | | | | | | | | | | | expose grpc.so_reuseport in C# | Jan Tattermusch | 2017-04-20 |
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | | | | eliminate crosstalk between C# tests | Jan Tattermusch | 2017-04-20 |
| | | | | | | | | * | | | | | | | expose grpc.so_reuseport in C# | Jan Tattermusch | 2017-04-20 |
| | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Merge pull request #10730 from ctiller/proxy_crash | Craig Tiller | 2017-04-19 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10691 from ncteisen/error-refcount | Noah Eisen | 2017-04-19 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | | | Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x | murgatroid99 | 2017-04-19 |
| | | | |_|_|_|/| | | | | | | | | | | |/| | | |/ / / / / / / / | |_|_|_|_|_|/| | | | | | | | |/| | | | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | | Remove DEBUG code that is itself buggy (integer overflow) | Vijay Pai | 2017-04-19 |
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | |