Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #10805 from dgquintas/g_for_1.4.x | David G. Quintas | 2017-04-26 |
|\ | |||
* \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-24 |
|\ \ | |||
| | * | updated g meaning for 1.4.x | David Garcia Quintas | 2017-04-21 |
| |/ | |||
| * | Changes required to make build possible: create separate grpc++_base{,_unsecu... | Vijay Pai | 2017-04-20 |
* | | Merge branch 'tsan-c++' into hybrid | Craig Tiller | 2017-04-20 |
|\| | |||
| * | Merge pull request #10182 from ctiller/cpparena | Craig Tiller | 2017-04-20 |
| |\ | |||
| * | | Fix bins/opt/end2end_test --gtest_filter=ProxyEnd2end/ProxyEnd2endTest.RpcDea... | Craig Tiller | 2017-04-19 |
| | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-18 |
| | |\ | | |/ | |/| | |||
* | | | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-18 |
|\| | | |||
| * | | Merge pull request #10626 from grpc/revert-10619-revert-9626-lazy-deframe | Muxi Yan | 2017-04-14 |
| |\ \ | |||
* | | | | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-14 |
|\| | | | |||
| | | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-14 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #10583 from ctiller/server_start | Craig Tiller | 2017-04-14 |
| |\ \ \ | |||
| | | * \ | Merge remote-tracking branch 'upstream/master' into revert-10619-revert-9626-... | Muxi Yan | 2017-04-14 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #9972 from sreecha/cq_create_api_changes | Sree Kuchibhotla | 2017-04-14 |
| |\ \ \ \ | |||
| | | | * | | Revert "Revert "Implement lazy deframe"" | Muxi Yan | 2017-04-12 |
| * | | | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-12 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | Revert "Implement lazy deframe" | Craig Tiller | 2017-04-12 |
| | | | | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-12 |
| | | | | |\ | | | |_|_|/ | | |/| | | | |||
| | | | * | | Merge github.com:grpc/grpc into server_start | Craig Tiller | 2017-04-12 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| * | | | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-12 |
| |\| | | | | |||
* | | | | | | Get rid of second api for marking non-listening cqs | Craig Tiller | 2017-04-12 |
* | | | | | | Fix registration | Craig Tiller | 2017-04-12 |
| | | | * | | Add synchronization so startup completes before shutdown begins | Craig Tiller | 2017-04-12 |
| | | | | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-12 |
| | | | | |\ | |||
* | | | | | | | Finish hybrid server stuff, ensure it gets tested | Craig Tiller | 2017-04-11 |
* | | | | | | | Support making hybrid cqs in core | Craig Tiller | 2017-04-11 |
| |_|/ / / / |/| | | | | | |||
| | | * | | | Threading robustness | Craig Tiller | 2017-04-11 |
| | | | |/ | | | |/| | |||
* | | | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-11 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-11 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into lazy-deframe | Muxi Yan | 2017-04-11 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | * | | Work with error refs | Muxi Yan | 2017-04-10 |
| * | | | | Merge pull request #10407 from kpayson64/alpine_linux_support | kpayson64 | 2017-04-10 |
| |\ \ \ \ | |||
* | | | | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-07 |
|\| | | | | | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into lazy-deframe | Muxi Yan | 2017-04-07 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-07 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #10365 from ctiller/lazy-parent | Craig Tiller | 2017-04-06 |
| |\ \ \ \ \ | |||
| | | * | | | | Fix build on Alpine linux + add portability tests | Ken Payson | 2017-04-06 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-06 |
|\| | | | | | |||
| * | | | | | Change pollset rules | Craig Tiller | 2017-04-05 |
| | * | | | | Fix nullptr deref | Craig Tiller | 2017-04-05 |
| | | | | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-05 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Merge github.com:grpc/grpc into lazy-parent | Craig Tiller | 2017-04-05 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-05 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #10364 from ctiller/lazy-batches | Craig Tiller | 2017-04-05 |
| |\ \ \ \ \ | |||
| | | | | * | | Bug fix | Muxi Yan | 2017-04-04 |
| | | | | * | | More merging fixes and asan fix | Muxi Yan | 2017-04-04 |
| | | | | | * | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-04 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | | | | * | | Merge remote-tracking branch 'upstream/master' into lazy-deframe | Muxi Yan | 2017-04-04 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | * | | | | Merge branch 'lazy-batches' into lazy-parent | Craig Tiller | 2017-04-04 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | |