aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Revert "Merge branch 'master' into v1.3.x"Gravatar Alexander Polcyn2017-04-26
* Merge branch 'master' into v1.3.xGravatar Yuchen Zeng2017-04-25
|\
| * Merge pull request #10844 from ctiller/PSCGravatar Craig Tiller2017-04-25
| |\
| | * Ensure port server can shutdownGravatar Craig Tiller2017-04-25
| | * Ensure port server runningGravatar Craig Tiller2017-04-25
| | * Recycle portsGravatar Craig Tiller2017-04-25
| | * Be resilient against failed runsGravatar Craig Tiller2017-04-25
| | * Allow a longer fetch time for port serverGravatar Craig Tiller2017-04-25
| |/
| * Merge pull request #10822 from ctiller/threaded_port_serverGravatar Craig Tiller2017-04-24
| |\
| * \ Merge pull request #10826 from ctiller/ubsanGravatar Craig Tiller2017-04-24
| |\ \
| * \ \ Merge pull request #10644 from MakMukhi/masterGravatar MakMukhi2017-04-24
| |\ \ \
* | \ \ \ Merge pull request #10764 from makdharma/v1.3.xGravatar makdharma2017-04-24
|\ \ \ \ \
| | * \ \ \ Merge pull request #10796 from danzh2010/udpserver2Gravatar Yang Gao2017-04-24
| | |\ \ \ \
| | | | | | * Add a mutex around allocate_portGravatar Craig Tiller2017-04-24
| | | | | * | Slow down timers for ubsan buildsGravatar Craig Tiller2017-04-24
| | | |_|/ / | | |/| | |
| | * | | | Merge pull request #10584 from ctiller/hybridGravatar Craig Tiller2017-04-24
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #10799 from vjpai/buildhealthGravatar Vijay Pai2017-04-24
| | |\ \ \ \ \
| | | | | | | * Threaded port_serverGravatar Craig Tiller2017-04-24
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pull request #10258 from markdroth/service_config_lb_semanticsGravatar Mark D. Roth2017-04-24
| | |\ \ \ \ \
| | | | | * | | Rollback some changesGravatar Craig Tiller2017-04-24
| | | | | * | | Rollback some changesGravatar Craig Tiller2017-04-24
| | | | | * | | Merge branch 'hybrid' of github.com:ctiller/grpc into hybridGravatar Craig Tiller2017-04-24
| | | | | |\ \ \
| | | | | * \ \ \ Merge github.com:grpc/grpc into hybridGravatar Craig Tiller2017-04-24
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #10802 from ctiller/proxyGravatar Craig Tiller2017-04-22
| | |\ \ \ \ \ \ \
| | | * | | | | | | Remove more spamGravatar Craig Tiller2017-04-21
| | | * | | | | | | Remove loggingGravatar Craig Tiller2017-04-21
| | * | | | | | | | Merge pull request #10801 from dgquintas/demote_handshakeGravatar David G. Quintas2017-04-21
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #10163 from ctiller/count_nowGravatar Craig Tiller2017-04-21
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Diff now tooGravatar Craig Tiller2017-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
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | Fix HTTP proxy testsGravatar Craig Tiller2017-04-21
| | | | | | * | | | | | | | Demote handshake logging msg to DEBUGGravatar David Garcia Quintas2017-04-21
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | doc/interop: Simplify language to fix missed x-user-ipGravatar Eric Anderson2017-04-21
| | * | | | | | | | | | | doc/interop: Fix link for CacheableUnaryCallGravatar Eric Anderson2017-04-21
| | | | | | | | * | | | | Avoid duplication in build rules by expanding the grpc_cc_libraries rule-crea...Gravatar Vijay Pai2017-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
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix markdown in README.mdGravatar Mehrdad Afshari2017-04-21
* | | | | | | | | | | | | | Merge pull request #10781 from y-zeng/python_cares_x64Gravatar Yuchen Zeng2017-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 remote-tracking branch 'upstream/master'Gravatar Dan Zhang2017-04-21
| | | | | | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| | | | | | | | | | | | | * | | Reinstate c++-compatGravatar Craig Tiller2017-04-21
| | | | | | | | | | | | | * | | Back out some bad changesGravatar Craig Tiller2017-04-21
| | | | | | | | | | | | | * | | Merge github.com:grpc/grpc into hybridGravatar Craig Tiller2017-04-21
| | | | | | | | | | | | |/| | | | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | |
| | | | | | | | | * | | | | | Merge github.com:grpc/grpc into c++compat1Gravatar Craig Tiller2017-04-21
| | | | | | | | | |\ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | |