Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | * | | Merge pull request #10990 from murgatroid99/version_1.3.1_bump | 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 | ||
| | |\ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | * | | Update version to 1.3.1 | 2017-05-04 | ||
| | | | | | * | | | | | | Merge branch 'master' into epoll_thread_pool | 2017-05-03 | ||
| | | | | | |\ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||
| | | | | | | | * | | | | Merge branch 'master' into cq_mpsc_based | 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 | ||
| | | | | |/ / / / / / | | | | |/| | | | | | | ||||
| | | | | | | | * | | | PHP: release 1.3, disable cares deps | 2017-05-02 | ||
| | | | | | | | |/ / | ||||
* | | | | | | | | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | 2017-05-02 | ||
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||
| | | * | | | | | | | Implement client-side load reporting for grpclb. | 2017-05-02 | ||
| | |/ / / / / / / | |/| | | | | | | | ||||
| * | | | | | | | | Merge pull request #10360 from dgquintas/grpclb_new_test | 2017-05-02 | ||
| |\ \ \ \ \ \ \ \ | ||||
| | | | | * \ \ \ \ | Merge github.com:grpc/grpc into epex4 | 2017-05-01 | ||
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | ||||
| | | | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into trying-to-fix-stuff | 2017-05-01 | ||
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||
| | | | | * | | | | | Merge branch 'hiertune' into epex4+epoll1 | 2017-05-01 | ||
| | | | | |\ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | ||||
| * | | | | | | | | | Remove leftover thrift mentions | 2017-05-01 | ||
| | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into backward-compat | 2017-04-30 | ||
| | | | | | |\ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||
* / | | | | | | | | | initial commit | 2017-04-28 | ||
|/ / / / / / / / / | ||||
| | | * | | | | | | Merge commit '3049460b75ac557348243601896ed68ca8145522' into master-upmerge-v... | 2017-04-28 | ||
| | | |\ \ \ \ \ \ | ||||
| | | * | | | | | | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | 2017-04-28 | ||
| |_|/| | | | | | | |/| | | | | | | | | | ||||
| | | | | | * | | | | sanity fixes | 2017-04-28 | ||
| | * | | | | | | | | Merge github.com:grpc/grpc into epoll1+hierarchical-turnstile | 2017-04-28 | ||
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||
| * | | | | | | | | | New version of grpclb end2end test | 2017-04-27 | ||
|/ / / / / / / / / | ||||
| | | | | | | * | | 1.3.0 -> 1.3.1-pre1 | 2017-04-27 | ||
| | | | | | | * | | s/1.3.0-pre/1.3.0 | 2017-04-27 | ||
| | | | | | | |/ | ||||
| * | | | | | | | Fix test compilation | 2017-04-27 | ||
| | | | | * | | | user-agent string filtering | 2017-04-27 | ||
* | | | | | | | | Merge pull request #10522 from jiangtaoli2016/new_tsi | 2017-04-27 | ||
|\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | Initial fork for singleton epoll poller | 2017-04-27 | ||
| |/ / / / / / / |/| | | | | | | | ||||
| | | | * | | | | Merge github.com:grpc/grpc into epex4 | 2017-04-27 | ||
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||
| | | | | | * | | Merge branch 'master' into cq_mpsc_based | 2017-04-26 | ||
| | | | | | |\ \ | ||||
| | | | | | | | * | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | 2017-04-26 | ||
| | | | |_|_|_|/| | | | |/| | | | | | ||||
* | | | | | | | | | Merge github.com:grpc/grpc into c++lame | 2017-04-26 | ||
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||
| | | | | | | | * | Revert "Merge branch 'master' into v1.3.x" | 2017-04-26 | ||
| * | | | | | | | | Merge pull request #10805 from dgquintas/g_for_1.4.x | 2017-04-26 | ||
| |\ \ \ \ \ \ \ \ | ||||
| | | | | | | * | | | 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 cq_mpsc_based | 2017-04-25 | ||
| | | | | | | | | |\ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||
| | | | | | * | | | | Merge branch 'master' into v1.3.x | 2017-04-25 | ||
| | | | | |/| | | | | | | | |/|/ / / / | | |_|_|/| | | | | |/| | | | | | | | ||||
| | | | | | * | | | Merge github.com:grpc/grpc into epex4 | 2017-04-25 | ||
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | |