aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
...
| | | | | | | | | * Merge branch 'master' into new_tsiGravatar jiangtaoli20162017-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
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| | | | | | | | | | * | fix C++ distribtestsGravatar Jan Tattermusch2017-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
|\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | updated g meaning for 1.4.xGravatar David Garcia 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 #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
| | | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | Merge github.com:grpc/grpc into c++lameGravatar Craig Tiller2017-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
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | 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 pull request #10787 from ctiller/timecap2Gravatar Craig Tiller2017-04-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Extend time capping to run_tests_matrix scriptsGravatar Craig Tiller2017-04-21
* | | | | | | | | | | | | | | | | Merge pull request #10785 from ctiller/timecapGravatar Craig Tiller2017-04-21
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Allow specifying a maximum run time to run_testsGravatar Craig Tiller2017-04-21
|/ / / / / / / / / / / / / / / /
| | | | | | | | | | * | | | | | regen projectsGravatar Craig Tiller2017-04-21
| | | | | | | | | | * | | | | | Merge github.com:grpc/grpc into hybridGravatar Craig Tiller2017-04-21
| | | | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #10756 from jtattermusch/csharp_prevent_reuseportGravatar Jan Tattermusch2017-04-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10599 from jtattermusch/upgrade_examplesGravatar 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
* | | | | | | | | | | | | | | | | | | Merge pull request #10708 from makdharma/interop_bazelGravatar makdharma2017-04-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | |