Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Upmerge from v1.3.x branch to master | Stanley Cheung | 2017-05-17 |
|\ | |||
* \ | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | Jan Tattermusch | 2017-05-17 |
|\ \ | |||
| * | | fix python artifact build | Jan Tattermusch | 2017-05-16 |
| | * | Bump to version 1.3.3 | Ken Payson | 2017-05-16 |
* | | | Fix bazel build | Muxi Yan | 2017-05-15 |
|/ / | |||
* | | Eliminate grpc_cc_libraries | Craig Tiller | 2017-05-15 |
* | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 |
|\ \ | |||
* | | | Fixing mock test target. | Nicolas "Pixel" Noble | 2017-05-12 |
* | | | Broken merge: missed a few new libraries. | Nicolas "Pixel" Noble | 2017-05-12 |
* | | | Merge failure - forgot grpc_generate_one_off_targets | Nicolas "Pixel" Noble | 2017-05-12 |
* | | | Merge failure - duplicated external_deps. | Nicolas "Pixel" Noble | 2017-05-12 |
| * | | Attempted fix | Craig Tiller | 2017-05-11 |
* | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-11 |
|\| | | |||
* | | | Disabling c-ares. | Nicolas "Pixel" Noble | 2017-05-11 |
| | * | Fixed BUILD as well | Stanley Cheung | 2017-05-10 |
| * | | Fix BUILD | Craig Tiller | 2017-05-10 |
| * | | Add missing file to BUILD | Craig Tiller | 2017-05-09 |
| * | | Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ | |||
| * | | | Fix deps between grpc and tracer system | Craig Tiller | 2017-05-05 |
| * | | | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'timer_pool' of github.com:ctiller/grpc into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'epex4' into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | | * | | | Fix BUILD | Craig Tiller | 2017-05-04 |
| | |/ / / | |/| | | | |||
| | | | * | Update version to 1.3.1 | murgatroid99 | 2017-05-04 |
| | | * | | Merge branch 'master' into epoll_thread_pool | Sree Kuchibhotla | 2017-05-03 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | * | | New epoll-based polling engine with dedicated poller threads | Sree Kuchibhotla | 2017-05-02 |
| * | | | | Implement client-side load reporting for grpclb. | Mark D. Roth | 2017-05-02 |
| | |/ / | |/| | | |||
| | * | | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-05-01 |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Merge branch 'hiertune' into epex4+epoll1 | Craig Tiller | 2017-05-01 |
| | |\ \ | |||
| * | | | | Remove leftover thrift mentions | David Garcia Quintas | 2017-05-01 |
| | |/ / | |/| | | |||
| | | * | 1.3.0 -> 1.3.1-pre1 | David Garcia Quintas | 2017-04-27 |
| | | * | s/1.3.0-pre/1.3.0 | David Garcia Quintas | 2017-04-27 |
| * | | | Merge pull request #10522 from jiangtaoli2016/new_tsi | David G. Quintas | 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 |
| |\ \ \ \ | |||
| | | | | * | Revert "Merge branch 'master' into v1.3.x" | Alexander Polcyn | 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 |
* | | | | | | Adding grpc_generate_one_off_targets target. | Nicolas "Pixel" Noble | 2017-04-25 |
| | | | * | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 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 |
| | | | |/ / | | | |/| | | |||
| | * / | | | Avoid duplication in build rules by expanding the grpc_cc_libraries rule-crea... | Vijay Pai | 2017-04-21 |
| | |/ / / | |||
| | * | | | Changes required to make build possible: create separate grpc++_base{,_unsecu... | Vijay Pai | 2017-04-20 |
| | * | | | Fix build rules for grpc++_unsecure, test that it builds properly | Vijay Pai | 2017-04-20 |
| | | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-20 |
| | | | |\ | | | |_|/ | | |/| | | |||
| * | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-19 |
| |\| | | | |||
| | | | * | Add epollex to BUILD | Craig Tiller | 2017-04-19 |