Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #11198 from stanley-cheung/upmerge-v1_3_2-to-master | 2017-05-18 | |
|\ | |||
* \ | Merge pull request #11201 from yang-g/debug | 2017-05-17 | |
|\ \ | |||
| | * | Upmerge from v1.3.x branch to master | 2017-05-17 | |
| |/| |/| | | |||
| * | | Unref pending events under cq lock | 2017-05-17 | |
* | | | Fix hpack_size test | 2017-05-17 | |
* | | | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | 2017-05-17 | |
|\ \ \ | |/ / |/| | | |||
* | | | Merge pull request #10897 from ctiller/serve_fries | 2017-05-16 | |
|\ \ \ | |||
* \ \ \ | Merge pull request #11000 from lyuxuan/poll_stat | 2017-05-16 | |
|\ \ \ \ | |||
| | | * | | fix python artifact build | 2017-05-16 | |
| |_|/ / |/| | | | |||
* | | | | Merge pull request #10800 from kpayson64/fix_alpine | 2017-05-16 | |
|\ \ \ \ | |||
| | * | | | fix extern c location | 2017-05-15 | |
| | * | | | fix last merge | 2017-05-15 | |
| | * | | | fix merge | 2017-05-15 | |
| | |\ \ \ | |||
| | * \ \ \ | merge master, resolve conflict | 2017-05-15 | |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
* | | | | | | Merge pull request #10662 from sreecha/cq_mpsc_based | 2017-05-15 | |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #11076 from dgquintas/epoll_error_static_string | 2017-05-12 | |
|\ \ \ \ \ \ \ | |||
| | * | | | | | | Merge with master and fix a bad-merge | 2017-05-11 | |
| | * | | | | | | clang | 2017-05-11 | |
| | * | | | | | | Merge branch 'master' into cq_mpsc_based | 2017-05-11 | |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
| | | | | | * | | Merge github.com:grpc/grpc into serve_fries | 2017-05-11 | |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| | | | | * | | | Merge branch 'master' into poll_stat | 2017-05-11 | |
| | | | |/| | | | |_|_|_|/ / / |/| | | | | | | |||
| | * | | | | | Merge branch 'master' into cq_mpsc_based | 2017-05-10 | |
| | |\ \ \ \ \ | |||
| * | | | | | | | Copy error string in GRPC_OS_ERROR | 2017-05-10 | |
| * | | | | | | | Don't crate GRPC_OS_ERROR with a non-static string | 2017-05-10 | |
| | |/ / / / / | |/| | | | | | |||
* | | | | | | | Fix portability | 2017-05-10 | |
* | | | | | | | Add missing include | 2017-05-10 | |
| | | | | | * | Improve how UV TCP servers and endpoints are shut down | 2017-05-09 | |
* | | | | | | | Solve uv link problem | 2017-05-09 | |
* | | | | | | | Fix printf | 2017-05-09 | |
* | | | | | | | Fix tracer usage | 2017-05-09 | |
* | | | | | | | Fix tracer decl | 2017-05-09 | |
* | | | | | | | Fix mac build | 2017-05-09 | |
* | | | | | | | Fix trace dependency mess | 2017-05-09 | |
| | | | * | | | Merge branch 'poll_stat' of github.com:lyuxuan/grpc into poll_stat | 2017-05-08 | |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'master' into poll_stat | 2017-05-08 | |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | | | | * | | | change gpr_atm to int | 2017-05-08 | |
| | | | |/ / / | |||
* | | | | | | | Merge github.com:grpc/grpc into uberpoll | 2017-05-07 | |
|\| | | | | | | |||
| | | | * | | | use lock instand of atomics, fix include position | 2017-05-05 | |
* | | | | | | | Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpoll | 2017-05-05 | |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Separate this into a new poller | 2017-05-05 | |
| * | | | | | | | Merge branch 'master' into cq_limited_pollers | 2017-05-05 | |
| |\ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll | 2017-05-05 | |
|\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge github.com:grpc/grpc into trickle_stall | 2017-05-05 | |
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||
* | | | | | | | | | | Header formatting | 2017-05-05 | |
* | | | | | | | | | | clang-format | 2017-05-05 | |
* | | | | | | | | | | Finish merge, disable new pollers until they stabilize | 2017-05-05 | |
* | | | | | | | | | | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll | 2017-05-05 | |
|\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Remove extra log line | 2017-05-05 | |
| |/ / / / / / / / / | |||
| * | | | | | | | | | Merge branch 'master' into epoll_thread_pool | 2017-05-05 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||
* | | | | | | | | | | Fix missing edge, add tracing | 2017-05-05 |