Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #11138 from grpc/revert-11121-revert-10849-backward-compat | Muxi Yan | 2017-05-16 |
|\ | |||
* \ | Merge pull request #11000 from lyuxuan/poll_stat | lyuxuan | 2017-05-16 |
|\ \ | |||
* \ \ | Merge pull request #10800 from kpayson64/fix_alpine | kpayson64 | 2017-05-16 |
|\ \ \ | |||
| | * | | fix extern c location | Yuxuan Li | 2017-05-15 |
| | * | | fix last merge | Yuxuan Li | 2017-05-15 |
| | * | | fix merge | Yuxuan Li | 2017-05-15 |
| | |\ \ | |||
| | * \ \ | merge master, resolve conflict | Yuxuan Li | 2017-05-15 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | | | * | Revert "Revert "Implement Server Backward Compatibility"" | Muxi Yan | 2017-05-15 |
| |_|_|/ |/| | | | |||
* | | | | Merge pull request #10662 from sreecha/cq_mpsc_based | Sree Kuchibhotla | 2017-05-15 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #11076 from dgquintas/epoll_error_static_string | David G. Quintas | 2017-05-12 |
|\ \ \ \ \ | |||
* | | | | | | Revert "Implement Server Backward Compatibility" | Nicolas Noble | 2017-05-12 |
* | | | | | | Merge pull request #10849 from muxi/backward-compat | Muxi Yan | 2017-05-12 |
|\ \ \ \ \ \ | |||
| | | * | | | | 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 |
| | | | | |/| | |_|_|_|_|/ |/| | | | | | |||
* | | | | | | Merge pull request #11010 from ctiller/uberpoll | Craig Tiller | 2017-05-11 |
|\ \ \ \ \ \ | |||
| | | | * \ \ | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-11 |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| | * | | | | | clang-format | Muxi Yan | 2017-05-11 |
* | | | | | | | Merge pull request #11067 from jtattermusch/core_fixing_nits | Jan Tattermusch | 2017-05-11 |
|\ \ \ \ \ \ \ | |||
| | | | | * \ \ | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-10 |
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||
| | | | * | | | | Copy error string in GRPC_OS_ERROR | David Garcia Quintas | 2017-05-10 |
| | | | * | | | | Don't crate GRPC_OS_ERROR with a non-static string | David Garcia Quintas | 2017-05-10 |
| |_|_|/ / / / |/| | | | | | | |||
| | | * | | | | Fix portability test | Muxi Yan | 2017-05-10 |
| | * | | | | | Merge github.com:grpc/grpc into uberpoll | Craig Tiller | 2017-05-10 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| | * | | | | | Fix portability | Craig Tiller | 2017-05-10 |
| * | | | | | | fix encoding of chars | Jan Tattermusch | 2017-05-10 |
| * | | | | | | print insecure channel target in trace | Jan Tattermusch | 2017-05-10 |
| | | * | | | | remove enable_workaround | Muxi Yan | 2017-05-10 |
| | * | | | | | Add missing include | Craig Tiller | 2017-05-10 |
| | | * | | | | Address comment - simplify code | Muxi Yan | 2017-05-09 |
* | | | | | | | Fix small message streaming ping-pong write count regression | Craig Tiller | 2017-05-09 |
|/ / / / / / | |||
| | * | | | | Put workaround list somewhere accessable by wrapping languages | Muxi Yan | 2017-05-09 |
| * | | | | | Solve uv link problem | Craig Tiller | 2017-05-09 |
| * | | | | | Fix printf | Craig Tiller | 2017-05-09 |
| * | | | | | Fix tracer usage | Craig Tiller | 2017-05-09 |
| * | | | | | Fix tracer decl | Craig Tiller | 2017-05-09 |
| * | | | | | Fix mac build | Craig Tiller | 2017-05-09 |
| * | | | | | Fix trace dependency mess | Craig Tiller | 2017-05-09 |
| | | | | * | Merge branch 'poll_stat' of github.com:lyuxuan/grpc into poll_stat | Yuxuan Li | 2017-05-08 |
| | | | | |\ | |||
| | | | | * \ | Merge branch 'master' into poll_stat | Yuxuan Li | 2017-05-08 |
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | |||
| | | | | | * | change gpr_atm to int | Yuxuan Li | 2017-05-08 |
| | | | | |/ | |||
| * | | | | | Merge github.com:grpc/grpc into uberpoll | Craig Tiller | 2017-05-07 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| | | | | * | use lock instand of atomics, fix include position | Yuxuan Li | 2017-05-05 |
| | * | | | | Merge remote-tracking branch 'upstream/master' into backward-compat | Muxi Yan | 2017-05-05 |
| | |\ \ \ \ | |||
| | * | | | | | clang-format | Muxi Yan | 2017-05-05 |
| | * | | | | | Rename grpc_user_agent_md to make it less confusing | Muxi Yan | 2017-05-05 |
| | * | | | | | Address comments | Muxi Yan | 2017-05-05 |
| * | | | | | | Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | Separate this into a new poller | Sree Kuchibhotla | 2017-05-05 |