Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #11075 from murgatroid99/node_expose_constants | Michael Lumish | 2017-05-11 |
|\ | |||
| * | Update list of js files in build.yaml | murgatroid99 | 2017-05-11 |
* | | 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 pull request #10360 from dgquintas/grpclb_new_test | David G. Quintas | 2017-05-02 |
| |\ \ \ | |||
| | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-05-01 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Merge branch 'master' of github.com:grpc/grpc into trying-to-fix-stuff | David Garcia Quintas | 2017-05-01 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge branch 'hiertune' into epex4+epoll1 | Craig Tiller | 2017-05-01 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
| * | | | | Remove leftover thrift mentions | David Garcia Quintas | 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 |
|\| | | | | | |||
| | * | | | | New version of grpclb end2end test | David Garcia Quintas | 2017-04-27 |
| |/ / / / | |||
* | | | | | Fix test compilation | Craig Tiller | 2017-04-27 |
| * | | | | 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 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | 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 |
| |\ \ \ \ \ | |||
| | | | | | * | 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 |
| | | | | |/| | | | | | |/|/ / | | |_|_|/| | | |/| | | | | | |||
| | | | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-25 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | | * | | | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-25 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #10826 from ctiller/ubsan | Craig Tiller | 2017-04-24 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 |
| |\ \ \ \ \ \ \ | |||
| | | * | | | | | | Slow down timers for ubsan builds | Craig Tiller | 2017-04-24 |
| | |/ / / / / / | |/| | | | | | | |||
| | | | | | * | | Remove non-libuv code from Node extension | murgatroid99 | 2017-04-24 |
| | | | | |/ / | |||
* | | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-24 |
|\| | | | | | | |||
| | | | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-24 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | | | * | | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-24 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | * | | | | updated g meaning for 1.4.x | David Garcia Quintas | 2017-04-21 |
| | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #10742 from markdroth/hash_table | Mark D. Roth | 2017-04-21 |
| |\ \ \ \ \ | |||
* | | | | | | | 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 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | |