Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 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 | |
| * | | | 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 | |
| | | * | | | | Merge branch 'timer_pool' into uberpoll | 2017-05-05 | |
| | | |\ \ \ \ | |||
| | | | * | | | | Fix misplaced unlock, cleanup tracing | 2017-05-05 | |
| | | * | | | | | Merge branch 'timer_pool' of github.com:ctiller/grpc into uberpoll | 2017-05-05 | |
| | | |\| | | | | |||
| | | * | | | | | Integrate new tracers | 2017-05-05 | |
| | | * | | | | | Merge branch 'epex4' into uberpoll | 2017-05-05 | |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'timer_pool' into uberpoll | 2017-05-05 | |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge github.com:grpc/grpc into hiertune | 2017-05-05 | |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||
| | | | | | * | | | | simplify | 2017-05-04 | |
| | | | | | * | | | | Eliminate some complexity | 2017-05-04 | |
| | | | | | * | | | | Reduce wakeups, comment code | 2017-05-04 | |
| | | | | | * | | | | Fix old trace vars | 2017-05-04 | |
| | | | | |/ / / / | | | | |/| | | | | |||
| | | | * | | | | | Merge github.com:grpc/grpc into timer_pool | 2017-05-04 | |
| | | | |\ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||
| | | | * | | | | | Merge branch '0bug' into timer_pool | 2017-05-04 | |
| | | | |\ \ \ \ \ |