Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | Broken merge: missed a few new libraries. | 2017-05-12 | ||
| | | | | ||||
| * | | | Merge failure - forgot grpc_generate_one_off_targets | 2017-05-12 | ||
| | | | | ||||
| * | | | Merge failure - duplicated external_deps. | 2017-05-12 | ||
| | | | | ||||
| | * | | Attempted fix | 2017-05-11 | ||
| | | | | ||||
| * | | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-11 | ||
| |\| | | ||||
| * | | | Disabling c-ares. | 2017-05-11 | ||
| | | | | ||||
| | | * | Fixed BUILD as well | 2017-05-10 | ||
| | | | | ||||
| | * | | Fix BUILD | 2017-05-10 | ||
| | | | | ||||
| | * | | Add missing file to BUILD | 2017-05-09 | ||
| | | | | ||||
| | * | | Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpoll | 2017-05-05 | ||
| | |\ \ | ||||
| | * | | | Fix deps between grpc and tracer system | 2017-05-05 | ||
| | | | | | ||||
| | * | | | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll | 2017-05-05 | ||
| | |\ \ \ | ||||
| | * \ \ \ | Merge branch 'timer_pool' of github.com:ctiller/grpc into uberpoll | 2017-05-05 | ||
| | |\ \ \ \ | ||||
| | * \ \ \ \ | Merge branch 'epex4' into uberpoll | 2017-05-05 | ||
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||
| | | | * | | | Fix BUILD | 2017-05-04 | ||
| | | |/ / / | | |/| | | | ||||
| | | | | * | Update version to 1.3.1 | 2017-05-04 | ||
| | | | | | | ||||
| | | | * | | Merge branch 'master' into epoll_thread_pool | 2017-05-03 | ||
| | | | |\ \ | | | |_|/ / | | |/| | | | ||||
| | | | * | | New epoll-based polling engine with dedicated poller threads | 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 github.com:grpc/grpc into epex4 | 2017-05-01 | ||
| | | |\ \ | | |_|/ / | |/| | | | ||||
| | | * | | Merge branch 'hiertune' into epex4+epoll1 | 2017-05-01 | ||
| | | |\ \ | ||||
| * | | | | | Remove leftover thrift mentions | 2017-05-01 | ||
| | |_|/ / | |/| | | | ||||
* | | | | | update | 2017-04-28 | ||
| | | | | | ||||
* | | | | | initial commit | 2017-04-28 | ||
|/ / / / | ||||
| | | * | 1.3.0 -> 1.3.1-pre1 | 2017-04-27 | ||
| | | | | ||||
| | | * | s/1.3.0-pre/1.3.0 | 2017-04-27 | ||
| | | | | ||||
* | | | | Merge pull request #10522 from jiangtaoli2016/new_tsi | 2017-04-27 | ||
|\ \ \ \ | | | | | | | | | | | Update TSI with new non-blocking TSI interfaces. | |||
| | | * \ | Merge github.com:grpc/grpc into epex4 | 2017-04-27 | ||
| | | |\ \ | |_|_|/ / |/| | | | | ||||
* | | | | | Merge github.com:grpc/grpc into c++lame | 2017-04-26 | ||
|\ \ \ \ \ | ||||
| | | | | * | Revert "Merge branch 'master' into v1.3.x" | 2017-04-26 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 79759fea1abd09102d38af3e13a84b69e898124b, reversing changes made to dc36f4df6aba60275a31227e1d29c4d20b6cadca. | |||
| * | | | | | Merge pull request #10805 from dgquintas/g_for_1.4.x | 2017-04-26 | ||
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | updated g meaning for 1.4.x | |||
| | | | | * | Allow EPOLLEXCLUSIVE tests to be omitted outside of CI | 2017-04-25 | ||
| | | | | | | ||||
| | | | * | | Adding grpc_generate_one_off_targets target. | 2017-04-25 | ||
| | | | | | | ||||
| | | * | | | Merge branch 'master' into new_tsi | 2017-04-24 | ||
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
* | | | | | | Merge github.com:grpc/grpc into c++lame | 2017-04-24 | ||
|\| | | | | | ||||
| | | | | * | Merge github.com:grpc/grpc into epex4 | 2017-04-24 | ||
| | | | | |\ | | |_|_|_|/ | |/| | | | | ||||
| | | * | | | Merge branch 'master' into new_tsi | 2017-04-24 | ||
| | | |\ \ \ | ||||
| | * | | | | | updated g meaning for 1.4.x | 2017-04-21 | ||
| | | |/ / / | | |/| | | | ||||
| * / | | | | Avoid duplication in build rules by expanding the grpc_cc_libraries ↵ | 2017-04-21 | ||
| |/ / / / | | | | | | | | | | | | | | | | rule-creation macro | |||
| * | | | | Changes required to make build possible: create separate ↵ | 2017-04-20 | ||
| | | | | | | | | | | | | | | | | | | | | grpc++_base{,_unsecure}, move grpc_compression_trace definition, and remove an assertion about library initialization from server | |||
| * | | | | Fix build rules for grpc++_unsecure, test that it builds properly | 2017-04-20 | ||
| | | | | | ||||
| | | | * | Merge github.com:grpc/grpc into epex4 | 2017-04-20 | ||
| | | | |\ | | |_|_|/ | |/| | | | ||||
* | | | | | Merge github.com:grpc/grpc into c++lame | 2017-04-19 | ||
|\| | | | | ||||
| | | | * | Add epollex to BUILD | 2017-04-19 | ||
| | | | | | ||||
| * | | | | Remove status_helper as it is not needed any more | 2017-04-18 | ||
| | |_|/ | |/| | | ||||
| | * | | Merge branch 'master' into new_tsi | 2017-04-15 | ||
| | |\ \ | | |/ / | |/| | | ||||
* | | | | Merge github.com:grpc/grpc into c++lame | 2017-04-14 | ||
|\| | | | ||||
| * | | | Merge github.com:grpc/grpc into minimal_test | 2017-04-13 | ||
| |\ \ \ | ||||
| | * | | | master to 1.4.0-dev | 2017-04-13 | ||
| | | | | |