Commit message (Expand) | Author | Age | |
---|---|---|---|
* | fix last merge | Yuxuan Li | 2017-05-15 |
* | fix merge | Yuxuan Li | 2017-05-15 |
|\ | |||
* \ | merge master, resolve conflict | Yuxuan Li | 2017-05-15 |
|\ \ | |||
| * | | Merge with master and fix a bad-merge | Sree Kuchibhotla | 2017-05-11 |
| * | | clang | Sree Kuchibhotla | 2017-05-11 |
| * | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-11 |
| |\ \ | |||
| | | * | Merge branch 'master' into poll_stat | lyuxuan | 2017-05-11 |
| |_|/| |/| |/ | |||
* | | | change gpr_atm to int | Yuxuan Li | 2017-05-08 |
* | | | use lock instand of atomics, fix include position | Yuxuan Li | 2017-05-05 |
| | * | clang-format | Craig Tiller | 2017-05-05 |
| | * | Merge branch 'epex4' into uberpoll | Craig Tiller | 2017-05-05 |
| | |\ | |||
| | * | | Add initializers for all tracers | Craig Tiller | 2017-05-04 |
* | | | | clean up, fix minor issue | Yuxuan Li | 2017-05-03 |
* | | | | initial implementation. | Yuxuan Li | 2017-05-03 |
| | * | | Fix mac build | Craig Tiller | 2017-05-03 |
| | * | | Fix ASAN/TSAN failures | Craig Tiller | 2017-05-03 |
| * | | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-03 |
| |\ \ \ | |/ / / |/| | | | |||
| | * | | Isolate timer checking in its own thread | Craig Tiller | 2017-05-02 |
| |/ / |/| | | |||
| | * | Merge branch 'hiertune' into epex4+epoll1 | Craig Tiller | 2017-05-01 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #10613 from ctiller/framing_costs | Craig Tiller | 2017-04-27 |
|\ \ \ | |||
| | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-27 |
| | | |\ | |_|_|/ |/| | | | |||
| | * | | clang format | Sree Kuchibhotla | 2017-04-26 |
| | * | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-04-26 |
| | |\ \ | |||
* | | \ \ | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-26 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #10805 from dgquintas/g_for_1.4.x | David G. Quintas | 2017-04-26 |
| |\ \ \ \ | |||
| | | | * | | correctly use cq vtable for all functions | Sree Kuchibhotla | 2017-04-25 |
| | | | * | | Fix Tsan failures | Sree Kuchibhotla | 2017-04-25 |
| | | | * | | Fix compilation issue (when GRPC_CQ_REF_COUNT_DEBUG is defined) | Sree Kuchibhotla | 2017-04-25 |
| | | | * | | Create cq vtable | Sree Kuchibhotla | 2017-04-25 |
| | | | * | | Merge with cq-hybrid poller changes | Sree Kuchibhotla | 2017-04-24 |
| | | | * | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-04-24 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-24 |
|\| | | | | | |||
| | | | | * | clang-format | Craig Tiller | 2017-04-24 |
| | | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-24 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-24 |
| | | | | |\ | |||
| * | | | | \ | 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 |
| | |/ / / / | |||
| | | | * | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-04-21 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
* | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-21 |
|\ \ \ \ \ \ | |||
| | | * | | | | Changes required to make build possible: create separate grpc++_base{,_unsecu... | Vijay Pai | 2017-04-20 |
| | |/ / / / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into framing_costs | Craig Tiller | 2017-04-20 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | Merge branch 'tsan-c++' into hybrid | Craig Tiller | 2017-04-20 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-20 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Merge pull request #10182 from ctiller/cpparena | Craig Tiller | 2017-04-20 |
| |\ \ \ \ \ | |||
| | | | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-20 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | Fix bins/opt/end2end_test --gtest_filter=ProxyEnd2end/ProxyEnd2endTest.RpcDea... | Craig Tiller | 2017-04-19 |
| | | | | * | | change mutex to spinlock | Sree Kuchibhotla | 2017-04-18 |
| | * | | | | | 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 branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-04-18 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | |