aboutsummaryrefslogtreecommitdiffhomepage
path: root/binding.gyp
Commit message (Expand)AuthorAge
* Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpollGravatar Craig Tiller2017-05-05
|\
| * Separate this into a new pollerGravatar Sree Kuchibhotla2017-05-05
* | Fix deps between grpc and tracer systemGravatar Craig Tiller2017-05-05
* | Finish merge, disable new pollers until they stabilizeGravatar Craig Tiller2017-05-05
* | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpollGravatar Craig Tiller2017-05-05
|\ \
| * | Merge branch 'master' into epoll_thread_poolGravatar Sree Kuchibhotla2017-05-05
| |\|
* | | Merge branch 'epex4' into uberpollGravatar Craig Tiller2017-05-05
|\ \ \
* \ \ \ Merge branch 'timer_pool' into uberpollGravatar Craig Tiller2017-05-05
|\ \ \ \
* \ \ \ \ Merge github.com:grpc/grpc into hiertuneGravatar Craig Tiller2017-05-05
|\ \ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge github.com:grpc/grpc into timer_poolGravatar Craig Tiller2017-05-04
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #10912 from dgquintas/trying-to-fix-stuffGravatar David G. Quintas2017-05-04
| |\ \ \ \
| | | | | * Merge branch 'master' into epoll_thread_poolGravatar Sree Kuchibhotla2017-05-03
| | | | | |\ | | |_|_|_|/ | |/| | | |
| | | * | | Merge github.com:grpc/grpc into timer_poolGravatar Craig Tiller2017-05-03
| | | |\ \ \ | | |_|/ / / | |/| | | |
* | | | | | Merge github.com:grpc/grpc into hiertuneGravatar Craig Tiller2017-05-03
|\| | | | |
| | | | | * New epoll-based polling engine with dedicated poller threadsGravatar Sree Kuchibhotla2017-05-02
| | | * | | Isolate timer checking in its own threadGravatar Craig Tiller2017-05-02
| | | | |/ | | | |/|
| * | / | Implement client-side load reporting for grpclb.Gravatar Mark D. Roth2017-05-02
| | |/ / | |/| |
| | | * Merge branch 'hiertune' into epex4+epoll1Gravatar Craig Tiller2017-05-01
| | | |\ | |_|_|/ |/| | |
| | * | Merge commit '3049460b75ac557348243601896ed68ca8145522' into master-upmerge-v...Gravatar David Garcia Quintas2017-04-28
| | |\ \
| | * | | Merge branch 'v1.3.x' into master-upmerge-v1.3.xGravatar David Garcia Quintas2017-04-28
| |/| | |
* | | | | Merge github.com:grpc/grpc into epoll1+hierarchical-turnstileGravatar Craig Tiller2017-04-28
|\| | | |
| * | | | Merge pull request #10522 from jiangtaoli2016/new_tsiGravatar David G. Quintas2017-04-27
| |\ \ \ \
* | | | | | Initial fork for singleton epoll pollerGravatar Craig Tiller2017-04-27
|/ / / / /
| | | | * Merge github.com:grpc/grpc into epex4Gravatar Craig Tiller2017-04-27
| | | | |\ | |_|_|_|/ |/| | | |
| | | | * Allow EPOLLEXCLUSIVE tests to be omitted outside of CIGravatar Craig Tiller2017-04-25
| | | * | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uvGravatar murgatroid992017-04-25
| | | |\ \
| | | | * | Merge branch 'master' into v1.3.xGravatar Yuchen Zeng2017-04-25
| | | |/| | | | |/| | |
| | | * | | Remove non-libuv code from Node extensionGravatar murgatroid992017-04-24
| | |/ / /
| * | | | Merge branch 'master' into new_tsiGravatar jiangtaoli20162017-04-24
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge github.com:grpc/grpc into c++lameGravatar Craig Tiller2017-04-21
|\ \ \ \ \ | | |/ / / | |/| | |
| | | | * Merge github.com:grpc/grpc into epex4Gravatar Craig Tiller2017-04-20
| | | | |\ | | |_|_|/ | |/| | |
| | | * | Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibilityGravatar Michael Lumish2017-04-20
| | | |\ \
| * | | \ \ Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.xGravatar murgatroid992017-04-19
| |\ \ \ \ \
| | | | * | | Node: fix the cases where zlib is builtGravatar murgatroid992017-04-19
| | | | * | | Node: Don't depend on cares npm packageGravatar murgatroid992017-04-19
| | | |/ / / | | |/| | |
| | | | * | Add flag to compile gpr with compatibility for muslGravatar murgatroid992017-04-19
| | | |/ / | | |/| |
| | | | * Merge github.com:grpc/grpc into epex4Gravatar Craig Tiller2017-04-17
| | | | |\ | | |_|_|/ | |/| | |
| | | * | Merge branch 'master' into new_tsiGravatar jiangtaoli20162017-04-15
| | | |\ \ | | |_|/ / | |/| | |
* | | | | Merge github.com:grpc/grpc into c++lameGravatar Craig Tiller2017-04-14
|\| | | |
| | * | | Build for more versions of electron, restrict when a Windows warning is shownGravatar murgatroid992017-04-13
| | | | * Merge github.com:grpc/grpc into epex3Gravatar Craig Tiller2017-04-13
| | | | |\ | | | |_|/ | | |/| |
| * | | | Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-12
| |\| | |
| | * | | Merge github.com:grpc/grpc into truebinGravatar Craig Tiller2017-04-12
| | |\ \ \
| * | \ \ \ Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-11
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge github.com:grpc/grpc into c++lameGravatar Craig Tiller2017-04-11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #10556 from murgatroid99/node_windows_warning_fixGravatar Michael Lumish2017-04-11
| |\ \ \ \ \
| | | | | * \ Merge branch 'master' into new_tsiGravatar jiangtaoli20162017-04-11
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | |
| | | * | | | Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-11
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | | | | * | Revise based on Mark's comments.Gravatar jiangtaoli20162017-04-10
| | * | | | | Node: fix Windows warning in binding.gyp for Win10 consoleGravatar murgatroid992017-04-10
| | | |_|/ / | | |/| | |