Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge | Michael Lumish | 2017-05-30 |
|\ | |||
| * | Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmerge | murgatroid99 | 2017-05-25 |
| |\ | |||
* | | | update | Vizerai | 2017-05-23 |
* | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | Vizerai | 2017-05-23 |
|\| | | |||
| * | | regenerate project | yang-g | 2017-05-19 |
| | * | get rid of connectivity state watchers right after timeout | Alexander Polcyn | 2017-05-18 |
| * | | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | Jan Tattermusch | 2017-05-17 |
| |\ \ | |||
| | * | | regenerate projects | Jan Tattermusch | 2017-05-16 |
| * | | | Move workaround_list to grpc_base | Muxi Yan | 2017-05-15 |
| * | | | Revert "Revert "Implement Server Backward Compatibility"" | Muxi Yan | 2017-05-15 |
| |/ / | |||
| * | | Revert "Implement Server Backward Compatibility" | Nicolas Noble | 2017-05-12 |
| * | | Merge pull request #10849 from muxi/backward-compat | Muxi Yan | 2017-05-12 |
| |\ \ | |||
| * | | | fix protoc x86 windows artifact build | Jan Tattermusch | 2017-05-12 |
| | * | | Add a separate test case for workaround_cronet_compression | Muxi Yan | 2017-05-09 |
| | * | | Put workaround list somewhere accessable by wrapping languages | Muxi Yan | 2017-05-09 |
| | * | | Merge remote-tracking branch 'upstream/master' into backward-compat | Muxi Yan | 2017-05-05 |
| | |\ \ | |||
| * | \ \ | Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ \ | |||
| | * | | | | Separate this into a new poller | Sree Kuchibhotla | 2017-05-05 |
| | | |/ / | | |/| | | |||
| * | | | | Fix deps between grpc and tracer system | Craig Tiller | 2017-05-05 |
| * | | | | Finish merge, disable new pollers until they stabilize | Craig Tiller | 2017-05-05 |
| * | | | | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'epex4' into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'timer_pool' into uberpoll | Craig Tiller | 2017-05-05 |
| |\ \ \ \ \ \ | |||
| | | | * | | | | Merge branch 'master' into epoll_thread_pool | Sree Kuchibhotla | 2017-05-03 |
| | | | |\| | | | |||
| | * | | | | | | Merge github.com:grpc/grpc into timer_pool | Craig Tiller | 2017-05-03 |
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | |||
| * | | | | | | | Merge github.com:grpc/grpc into hiertune | Craig Tiller | 2017-05-03 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | | | | * | | | New epoll-based polling engine with dedicated poller threads | Sree Kuchibhotla | 2017-05-02 |
| | | * | | | | | Isolate timer checking in its own thread | Craig Tiller | 2017-05-02 |
| | | | |/ / / | | | |/| | | | |||
* | | | | | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | Vizerai | 2017-05-02 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | * | | | | Implement client-side load reporting for grpclb. | Mark D. Roth | 2017-05-02 |
| | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #10360 from dgquintas/grpclb_new_test | David G. Quintas | 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 |
| | | | | * | | Merge remote-tracking branch 'upstream/master' into backward-compat | Muxi Yan | 2017-04-30 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
* / | | | | | | initial commit | Vizerai | 2017-04-28 |
|/ / / / / / | |||
| | | | * | | Add end2end test for workarounds | Muxi Yan | 2017-04-28 |
| | * | | | | Merge github.com:grpc/grpc into epoll1+hierarchical-turnstile | Craig Tiller | 2017-04-28 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | New version of grpclb end2end test | David Garcia Quintas | 2017-04-27 |
|/ / / / / | |||
| | | * | | user-agent string filtering | Muxi Yan | 2017-04-27 |
* | | | | | Merge pull request #10522 from jiangtaoli2016/new_tsi | David G. Quintas | 2017-04-27 |
|\ \ \ \ \ | |||
| | * | | | | Initial fork for singleton epoll poller | Craig Tiller | 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 |
| | |_|_|/ | |/| | | | |||
| | | | * | Add cronet_compression workaround filter | Muxi Yan | 2017-04-25 |
| | |_|/ | |/| | | |||
| | | * | Allow EPOLLEXCLUSIVE tests to be omitted outside of CI | Craig Tiller | 2017-04-25 |
| | | * | Merge github.com:grpc/grpc into epex4 | Craig Tiller | 2017-04-25 |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-25 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 |
| |\ \ \ |