aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uvGravatar murgatroid992017-04-25
|\
| * Merge branch 'master' into v1.3.xGravatar Yuchen Zeng2017-04-25
| |\
* | | Remove another from Node extensionGravatar murgatroid992017-04-25
| | * Merge pull request #10644 from MakMukhi/masterGravatar MakMukhi2017-04-24
| | |\
| | * \ Merge pull request #10796 from danzh2010/udpserver2Gravatar Yang Gao2017-04-24
| | |\ \
* | | | | Remove non-libuv code from Node extensionGravatar murgatroid992017-04-24
|/ / / /
| * | | Merge pull request #10584 from ctiller/hybridGravatar Craig Tiller2017-04-24
| |\ \ \
| * \ \ \ Merge pull request #10258 from markdroth/service_config_lb_semanticsGravatar Mark D. Roth2017-04-24
| |\ \ \ \
| | | * \ \ Merge github.com:grpc/grpc into hybridGravatar Craig Tiller2017-04-24
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #10801 from dgquintas/demote_handshakeGravatar David G. Quintas2017-04-21
| |\ \ \ \ \
| * \ \ \ \ \ Merge github.com:grpc/grpc into count_nowGravatar Craig Tiller2017-04-21
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #10777 from ctiller/c++compat1Gravatar Craig Tiller2017-04-21
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #10779 from ctiller/c++compat2Gravatar Craig Tiller2017-04-21
| | |\ \ \ \ \ \ \
| | | | | * | | | | Demote handshake logging msg to DEBUGGravatar David Garcia Quintas2017-04-21
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #10505 from muxi/move-parsing-queueGravatar Muxi Yan2017-04-21
| | |\ \ \ \ \ \ \
| | | | | | | | * | Add make udp_server shutdown_fd() protected by mutex lock.Gravatar Dan Zhang2017-04-21
| | * | | | | | | | Merge pull request #10639 from vjpai/buildfixesGravatar Vijay Pai2017-04-21
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #10775 from yang-g/http2_clientGravatar Yang Gao2017-04-21
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pull request #10742 from markdroth/hash_tableGravatar Mark D. Roth2017-04-21
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into service_config_lb_semanticsGravatar Mark D. Roth2017-04-21
| | | | | | | | | |\ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | | | | | | * | | | Merge github.com:grpc/grpc into c++compat1Gravatar Craig Tiller2017-04-21
| | | | | | | | |\ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | | | | | * | | | | Merge github.com:grpc/grpc into c++compat2Gravatar Craig Tiller2017-04-21
| | | | | | | |\ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #10771 from ncteisen/yet-another-error-refcount-bugGravatar Noah Eisen2017-04-21
| | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ Merge github.com:grpc/grpc into hybridGravatar Craig Tiller2017-04-21
| | | | | | | | | | | |\ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10757 from jtattermusch/csharp_prevent_reuseport_v13xGravatar Jan Tattermusch2017-04-21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge pull request #10756 from jtattermusch/csharp_prevent_reuseportGravatar Jan Tattermusch2017-04-21
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | Fix nitGravatar Muxi Yan2017-04-20
| | | * | | | | | | | | | | | Merge pull request #10739 from muxi/fix-unpaired-benchmarkGravatar Muxi Yan2017-04-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/grpc/grpc into yet-another-error-...Gravatar Noah Eisen2017-04-20
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | | | | | | | | | * | | | | C++ compatibility fix for stack_lockfree.cGravatar Craig Tiller2017-04-20
| | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |
| | | | | | | | | | | * | | | C++ compatibility fix for tmpfile_posix.cGravatar Craig Tiller2017-04-20
| | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | | | | | | | | * | | | | Changes required to make build possible: create separate grpc++_base{,_unsecu...Gravatar Vijay Pai2017-04-20
| | | | | | | | | * | | | | One more use of incorrect submodule nameGravatar Vijay Pai2017-04-20
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | | | | | | * | | | | Fix http2_interop test for c++ and pythonGravatar yang-g2017-04-20
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | | | | * | | | | | Fix error refcount bugGravatar Noah Eisen2017-04-20
| | | | | | | | | | * | Merge branch 'tsan-c++' into hybridGravatar Craig Tiller2017-04-20
| | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge pull request #10182 from ctiller/cpparenaGravatar Craig Tiller2017-04-20
| | | |\ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibilityGravatar Michael Lumish2017-04-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge pull request #10748 from murgatroid99/upmerge_v1.3.xGravatar Michael Lumish2017-04-20
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge pull request #10450 from vjpai/framerGravatar Vijay Pai2017-04-20
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10747 from vjpai/dedebugGravatar Vijay Pai2017-04-20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * | | | | clang-formatGravatar Mark D. Roth2017-04-20
| | * | | | | | | | | | | | | | | eliminate crosstalk between C# testsGravatar Jan Tattermusch2017-04-20
| | * | | | | | | | | | | | | | | expose grpc.so_reuseport in C#Gravatar Jan Tattermusch2017-04-20
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | eliminate crosstalk between C# testsGravatar Jan Tattermusch2017-04-20
| | | | | | | | | * | | | | | | expose grpc.so_reuseport in C#Gravatar Jan Tattermusch2017-04-20
| | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge pull request #10730 from ctiller/proxy_crashGravatar Craig Tiller2017-04-19
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10691 from ncteisen/error-refcountGravatar Noah Eisen2017-04-19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |
| | | | | | | | * | | | | | | | Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.xGravatar murgatroid992017-04-19
| | | | |_|_|_|/| | | | | | | | | | | |/| | | |/ / / / / / / / | |_|_|_|_|_|/| | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Remove DEBUG code that is itself buggy (integer overflow)Gravatar Vijay Pai2017-04-19
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |