Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | Merge pull request #11264 from smulikHakipod/master | 2017-06-05 | ||
| |_|/| |/| | | | | | | | Compilation without ALPN support does not work | |||
| | * | | Merge branch 'thread_pool' into ALL-the-things | 2017-05-30 | ||
| |/| | |/| | | | ||||
* | | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | 2017-05-23 | ||
|\| | | | ||||
| | | * | after running gen project | 2017-05-22 | ||
| | | | | ||||
| | | * | ALPN fix | 2017-05-22 | ||
| | |/ | |/| | ||||
| | * | Merge github.com:grpc/grpc into thread_pool | 2017-05-17 | ||
| | |\ | | |/ | |/| | ||||
| * | | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | 2017-05-17 | ||
| |\ \ | | | | | | | | | Try fixing python artifact build on Windows | |||
| | | * | Merge github.com:grpc/grpc into thread_pool | 2017-05-16 | ||
| | | |\ | | |_|/ | |/| | | ||||
| | * | | regenerate projects | 2017-05-16 | ||
| | | | | ||||
| * | | | Revert "Revert "Implement Server Backward Compatibility"" | 2017-05-15 | ||
| |/ / | ||||
| * | | Revert "Implement Server Backward Compatibility" | 2017-05-12 | ||
| | | | ||||
| * | | Merge pull request #10849 from muxi/backward-compat | 2017-05-12 | ||
| |\ \ | | | | | | | | | Implement Server Backward Compatibility | |||
| | | * | Remove workqueue, covered_by_poller as concepts, get Mac build up | 2017-05-12 | ||
| | |/ | |/| | ||||
| | * | Merge remote-tracking branch 'upstream/master' into backward-compat | 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 | ||
| | | |/ | | |/| | ||||
| * | | | Fix deps between grpc and tracer system | 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 | ||
| |\ \ \ | ||||
| | * | | | Merge branch 'master' into epoll_thread_pool | 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 | ||
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||
| | | * | | | | Merge github.com:grpc/grpc into timer_pool | 2017-05-04 | ||
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | ||||
| | * | | | | | Merge pull request #10912 from dgquintas/trying-to-fix-stuff | 2017-05-04 | ||
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Upmerge from 1.3.0 to master | |||
| | | | | | * \ | Merge branch 'master' into epoll_thread_pool | 2017-05-03 | ||
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | ||||
| | | | * | | | | Merge github.com:grpc/grpc into timer_pool | 2017-05-03 | ||
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||
| * | | | | | | | Merge github.com:grpc/grpc into hiertune | 2017-05-03 | ||
| |\| | | | | | | ||||
| | | | | | * | | New epoll-based polling engine with dedicated poller threads | 2017-05-02 | ||
| | | | | | | | | ||||
| | | | * | | | | Isolate timer checking in its own thread | 2017-05-02 | ||
| | | | | |/ / | | | | |/| | | ||||
| | * | / | | | Implement client-side load reporting for grpclb. | 2017-05-02 | ||
| | | |/ / / | | |/| | | | ||||
| | | | * | | Merge branch 'hiertune' into epex4+epoll1 | 2017-05-01 | ||
| | | | |\ \ | | |_|_|/ / | |/| | | | | ||||
| | | | | * | Merge remote-tracking branch 'upstream/master' into backward-compat | 2017-04-30 | ||
| | | | | |\ | | | |_|_|/ | | |/| | | | ||||
* | / | | | | initial commit | 2017-04-28 | ||
| |/ / / / |/| | | | | ||||
| | * | | | Merge commit '3049460b75ac557348243601896ed68ca8145522' into ↵ | 2017-04-28 | ||
| | |\ \ \ | | | | | | | | | | | | | | | | | | | master-upmerge-v1.3.x | |||
| | * | | | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | 2017-04-28 | ||
| |/| | | | |/| | | | | | ||||
| * | | | | | Merge github.com:grpc/grpc into epoll1+hierarchical-turnstile | 2017-04-28 | ||
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||
| | | | | * | user-agent string filtering | 2017-04-27 | ||
| | | | | | | ||||
* | | | | | | Merge pull request #10522 from jiangtaoli2016/new_tsi | 2017-04-27 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update TSI with new non-blocking TSI interfaces. | |||
| | * | | | | | Initial fork for singleton epoll poller | 2017-04-27 | ||
| |/ / / / / |/| | | | | | ||||
| | | | * | | Merge github.com:grpc/grpc into epex4 | 2017-04-27 | ||
| | | | |\ \ | |_|_|_|/ / |/| | | | | | ||||
| | | | | * | Add cronet_compression workaround filter | 2017-04-25 | ||
| | | | | | | ||||
| | | | * | | Allow EPOLLEXCLUSIVE tests to be omitted outside of CI | 2017-04-25 | ||
| | | | | | | ||||
| | | * | | | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | 2017-04-25 | ||
| | | |\ \ \ | ||||
| | | | * | | | Merge branch 'master' into v1.3.x | 2017-04-25 | ||
| | | |/| | | | | |/| | |/ | | | | |/| | ||||
| | | * / | | Remove non-libuv code from Node extension | 2017-04-24 | ||
| | |/ / / | ||||
| * | | | | Merge branch 'master' into new_tsi | 2017-04-24 | ||
| |\ \ \ \ | | | |/ / | | |/| | | ||||
* | | | | | Merge github.com:grpc/grpc into c++lame | 2017-04-21 | ||
|\ \ \ \ \ | | |/ / / | |/| | | | ||||
| | | | * | Merge github.com:grpc/grpc into epex4 | 2017-04-20 | ||
| | | | |\ | | |_|_|/ | |/| | | | ||||
| | | * | | Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibility | 2017-04-20 | ||
| | | |\ \ | | | | | | | | | | | | | Add flag to compile gpr with compatibility for musl |