Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
* | | Fix deps between grpc and tracer system | Craig Tiller | 2017-05-05 |
* | | Finish merge, disable new pollers until they stabilize | Craig Tiller | 2017-05-05 |
* | | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll | Craig Tiller | 2017-05-05 |
|\ \ | |||
| * | | Merge branch 'master' into epoll_thread_pool | Sree Kuchibhotla | 2017-05-05 |
| |\| | |||
* | | | Merge branch 'epex4' into uberpoll | Craig Tiller | 2017-05-05 |
|\ \ \ | |||
* \ \ \ | Merge branch 'timer_pool' into uberpoll | Craig Tiller | 2017-05-05 |
|\ \ \ \ | |||
* \ \ \ \ | Merge github.com:grpc/grpc into hiertune | Craig Tiller | 2017-05-05 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into timer_pool | Craig Tiller | 2017-05-04 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #10912 from dgquintas/trying-to-fix-stuff | David G. Quintas | 2017-05-04 |
| |\ \ \ \ | |||
| | | | | * | Merge branch 'master' into epoll_thread_pool | Sree Kuchibhotla | 2017-05-03 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into timer_pool | Craig Tiller | 2017-05-03 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
* | | | | | | Merge github.com:grpc/grpc into hiertune | Craig Tiller | 2017-05-03 |
|\| | | | | | |||
| | | | | * | New epoll-based polling engine with dedicated poller threads | Sree Kuchibhotla | 2017-05-02 |
| | | * | | | Isolate timer checking in its own thread | Craig Tiller | 2017-05-02 |
| | | | |/ | | | |/| | |||
| * | / | | Implement client-side load reporting for grpclb. | Mark D. Roth | 2017-05-02 |
| | |/ / | |/| | | |||
| | | * | Merge branch 'hiertune' into epex4+epoll1 | Craig Tiller | 2017-05-01 |
| | | |\ | |_|_|/ |/| | | | |||
| | * | | Merge commit '3049460b75ac557348243601896ed68ca8145522' into master-upmerge-v... | David Garcia Quintas | 2017-04-28 |
| | |\ \ | |||
| | * | | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | David Garcia Quintas | 2017-04-28 |
| |/| | | | |||
* | | | | | Merge github.com:grpc/grpc into epoll1+hierarchical-turnstile | Craig Tiller | 2017-04-28 |
|\| | | | | |||
| * | | | | Merge pull request #10522 from jiangtaoli2016/new_tsi | David G. Quintas | 2017-04-27 |
| |\ \ \ \ | |||
* | | | | | | Initial fork for singleton epoll poller | Craig Tiller | 2017-04-27 |
|/ / / / / | |||
| | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-27 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
| | | | * | Allow EPOLLEXCLUSIVE tests to be omitted outside of CI | Craig Tiller | 2017-04-25 |
| | | * | | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | murgatroid99 | 2017-04-25 |
| | | |\ \ | |||
| | | | * | | Merge branch 'master' into v1.3.x | Yuchen Zeng | 2017-04-25 |
| | | |/| | | | |/| | | | |||
| | | * | | | Remove non-libuv code from Node extension | murgatroid99 | 2017-04-24 |
| | |/ / / | |||
| * | | | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-24 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
* | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-21 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-20 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibility | Michael Lumish | 2017-04-20 |
| | | |\ \ | |||
| * | | \ \ | Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x | murgatroid99 | 2017-04-19 |
| |\ \ \ \ \ | |||
| | | | * | | | Node: fix the cases where zlib is built | murgatroid99 | 2017-04-19 |
| | | | * | | | Node: Don't depend on cares npm package | murgatroid99 | 2017-04-19 |
| | | |/ / / | | |/| | | | |||
| | | | * | | Add flag to compile gpr with compatibility for musl | murgatroid99 | 2017-04-19 |
| | | |/ / | | |/| | | |||
| | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-17 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-15 |
| | | |\ \ | | |_|/ / | |/| | | | |||
* | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-14 |
|\| | | | | |||
| | * | | | Build for more versions of electron, restrict when a Windows warning is shown | murgatroid99 | 2017-04-13 |
| | | | * | Merge github.com:grpc/grpc into epex3 | Craig Tiller | 2017-04-13 |
| | | | |\ | | | |_|/ | | |/| | | |||
| * | | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-12 |
| |\| | | | |||
| | * | | | Merge github.com:grpc/grpc into truebin | Craig Tiller | 2017-04-12 |
| | |\ \ \ | |||
| * | \ \ \ | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-11 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
* | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-11 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #10556 from murgatroid99/node_windows_warning_fix | Michael Lumish | 2017-04-11 |
| |\ \ \ \ \ | |||
| | | | | * \ | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-11 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-11 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | | * | | Revise based on Mark's comments. | jiangtaoli2016 | 2017-04-10 |
| | * | | | | | Node: fix Windows warning in binding.gyp for Win10 console | murgatroid99 | 2017-04-10 |
| | | |_|/ / | | |/| | | |