Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | | | | | | * | | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-24 | |
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | ||||
| | | | | | | | | | * | | | fix guards in transport_security_adapter.h | jiangtaoli2016 | 2017-04-24 | |
| | | | * | | | | | | | | | Add a mutex around allocate_port | Craig Tiller | 2017-04-24 | |
| | | * | | | | | | | | | | Slow down timers for ubsan builds | Craig Tiller | 2017-04-24 | |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||
| | | | | | | * | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-24 | |
| | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge pull request #10584 from ctiller/hybrid | Craig Tiller | 2017-04-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | * | Fix potential memory leak, cleanup some code | Craig Tiller | 2017-04-24 | |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||
| | | | | | | * | | | | | Don't abort on input | Noah Eisen | 2017-04-24 | |
* | | | | | | | | | | | | Merge pull request #10799 from vjpai/buildhealth | Vijay Pai | 2017-04-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||
| | | | | * | | | | | | | Threaded port_server | Craig Tiller | 2017-04-24 | |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||
| | | | | | | | | * | | fix guard on src/core/tsi/transport_security_adapter.h | jiangtaoli2016 | 2017-04-24 | |
| | | | | | | | | * | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-24 | |
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||
* | | | | | | | | | | | Merge pull request #10258 from markdroth/service_config_lb_semantics | Mark D. Roth | 2017-04-24 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | Rollback some changes | Craig Tiller | 2017-04-24 | |
| | | * | | | | | | | | | Rollback some changes | Craig Tiller | 2017-04-24 | |
| | | * | | | | | | | | | Merge branch 'hybrid' of github.com:ctiller/grpc into hybrid | Craig Tiller | 2017-04-24 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-24 | |
| | | |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | ||||
| | | | | | | | | | * | | | fix C++ distribtests | Jan Tattermusch | 2017-04-24 | |
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge pull request #10802 from ctiller/proxy | Craig Tiller | 2017-04-22 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | Remove more spam | Craig Tiller | 2017-04-21 | |
| * | | | | | | | | | | | | Remove logging | Craig Tiller | 2017-04-21 | |
* | | | | | | | | | | | | | Merge pull request #10801 from dgquintas/demote_handshake | David G. Quintas | 2017-04-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | * | | | | updated g meaning for 1.4.x | David Garcia Quintas | 2017-04-21 | |
| | | | | | | | | | | | | * | Copy slices for in-process transports: its no longer safe to just ref | Craig Tiller | 2017-04-21 | |
* | | | | | | | | | | | | | | Merge pull request #10163 from ctiller/count_now | Craig Tiller | 2017-04-21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | Diff now too | Craig Tiller | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | Fix HTTP proxy tests | Craig Tiller | 2017-04-21 | |
| | | | * | | | | | | | | | | | | Demote handshake logging msg to DEBUG | David Garcia Quintas | 2017-04-21 | |
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | doc/interop: Simplify language to fix missed x-user-ip | Eric Anderson | 2017-04-21 | |
* | | | | | | | | | | | | | | | doc/interop: Fix link for CacheableUnaryCall | Eric Anderson | 2017-04-21 | |
| | | | | | * | | | | | | | | | Avoid duplication in build rules by expanding the grpc_cc_libraries rule-crea... | Vijay Pai | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* | | | | | | | | | | | | | | | | Fix markdown in README.md | Mehrdad Afshari | 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 remote-tracking branch 'upstream/master' | Dan Zhang | 2017-04-21 | |
| | | | | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | * | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-21 | |
| | | | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | * | | | | | | | Reinstate c++-compat | Craig Tiller | 2017-04-21 | |
| | | | | | | | | | * | | | | | | | Back out some bad changes | Craig Tiller | 2017-04-21 | |
| | | | | | | | | | * | | | | | | | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-21 | |
| | | | | | | | | |/| | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | * | Merge github.com:grpc/grpc into framing_costs | Craig Tiller | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |