Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Revert "Merge branch 'master' into v1.3.x" | 2017-04-26 | |
* | Merge branch 'master' into v1.3.x | 2017-04-25 | |
|\ | |||
| * | Merge pull request #10844 from ctiller/PSC | 2017-04-25 | |
| |\ | |||
| | * | Ensure port server can shutdown | 2017-04-25 | |
| | * | Ensure port server running | 2017-04-25 | |
| | * | Recycle ports | 2017-04-25 | |
| | * | Be resilient against failed runs | 2017-04-25 | |
| | * | Allow a longer fetch time for port server | 2017-04-25 | |
| |/ | |||
| * | Merge pull request #10822 from ctiller/threaded_port_server | 2017-04-24 | |
| |\ | |||
| * \ | Merge pull request #10826 from ctiller/ubsan | 2017-04-24 | |
| |\ \ | |||
| * \ \ | Merge pull request #10644 from MakMukhi/master | 2017-04-24 | |
| |\ \ \ | |||
* | \ \ \ | Merge pull request #10764 from makdharma/v1.3.x | 2017-04-24 | |
|\ \ \ \ \ | |||
| | * \ \ \ | Merge pull request #10796 from danzh2010/udpserver2 | 2017-04-24 | |
| | |\ \ \ \ | |||
| | | | | | * | Add a mutex around allocate_port | 2017-04-24 | |
| | | | | * | | Slow down timers for ubsan builds | 2017-04-24 | |
| | | |_|/ / | | |/| | | | |||
| | * | | | | Merge pull request #10584 from ctiller/hybrid | 2017-04-24 | |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge pull request #10799 from vjpai/buildhealth | 2017-04-24 | |
| | |\ \ \ \ \ | |||
| | | | | | | * | Threaded port_server | 2017-04-24 | |
| | | |_|_|_|/ | | |/| | | | | |||
| | * | | | | | Merge pull request #10258 from markdroth/service_config_lb_semantics | 2017-04-24 | |
| | |\ \ \ \ \ | |||
| | | | | * | | | Rollback some changes | 2017-04-24 | |
| | | | | * | | | Rollback some changes | 2017-04-24 | |
| | | | | * | | | Merge branch 'hybrid' of github.com:ctiller/grpc into hybrid | 2017-04-24 | |
| | | | | |\ \ \ | |||
| | | | | * \ \ \ | Merge github.com:grpc/grpc into hybrid | 2017-04-24 | |
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||
| | * | | | | | | | Merge pull request #10802 from ctiller/proxy | 2017-04-22 | |
| | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | Remove more spam | 2017-04-21 | |
| | | * | | | | | | | Remove logging | 2017-04-21 | |
| | * | | | | | | | | Merge pull request #10801 from dgquintas/demote_handshake | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge pull request #10163 from ctiller/count_now | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | Diff now too | 2017-04-21 | |
| | | * | | | | | | | | | Merge github.com:grpc/grpc into count_now | 2017-04-21 | |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | Merge pull request #10777 from ctiller/c++compat1 | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #10779 from ctiller/c++compat2 | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | * | | | | | | | Fix HTTP proxy tests | 2017-04-21 | |
| | | | | | * | | | | | | | | Demote handshake logging msg to DEBUG | 2017-04-21 | |
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | doc/interop: Simplify language to fix missed x-user-ip | 2017-04-21 | |
| | * | | | | | | | | | | | doc/interop: Fix link for CacheableUnaryCall | 2017-04-21 | |
| | | | | | | | * | | | | | Avoid duplication in build rules by expanding the grpc_cc_libraries rule-crea... | 2017-04-21 | |
| | * | | | | | | | | | | | Merge pull request #10505 from muxi/move-parsing-queue | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |||
| | | | | | | | | | | * | | Add make udp_server shutdown_fd() protected by mutex lock. | 2017-04-21 | |
| | * | | | | | | | | | | | Merge pull request #10639 from vjpai/buildfixes | 2017-04-21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | Fix markdown in README.md | 2017-04-21 | |
* | | | | | | | | | | | | | | Merge pull request #10781 from y-zeng/python_cares_x64 | 2017-04-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10775 from yang-g/http2_client | 2017-04-21 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10742 from markdroth/hash_table | 2017-04-21 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into service_config_lb_semantics | 2017-04-21 | |
| | | | | | | | | | | |\ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | |||
| | | | | | | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' | 2017-04-21 | |
| | | | | | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |||
| | | | | | | | | | | | | * | | | Reinstate c++-compat | 2017-04-21 | |
| | | | | | | | | | | | | * | | | Back out some bad changes | 2017-04-21 | |
| | | | | | | | | | | | | * | | | Merge github.com:grpc/grpc into hybrid | 2017-04-21 | |
| | | | | | | | | | | | |/| | | | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |||
| | | | | | | | | * | | | | | | Merge github.com:grpc/grpc into c++compat1 | 2017-04-21 | |
| | | | | | | | | |\ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |