aboutsummaryrefslogtreecommitdiffhomepage
path: root/CMakeLists.txt
Commit message (Expand)AuthorAge
* Merge branch 'selectivity' into ALL-the-thingsGravatar Craig Tiller2017-06-02
|\
| * master bumped to 1.5.xGravatar David Garcia Quintas2017-05-30
| * Merge pull request #11309 from murgatroid99/master_1.3.x_upmergeGravatar Michael Lumish2017-05-30
| |\
* | \ Merge branch 'thread_pool' into ALL-the-thingsGravatar Craig Tiller2017-05-30
|\ \ \ | |/ / |/| |
| | * Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmergeGravatar murgatroid992017-05-25
| | |\
| * | | Merge github.com:grpc/grpc into thread_poolGravatar Craig Tiller2017-05-23
| |\| |
* | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_mapGravatar Vizerai2017-05-23
|\ \ \ \ | | |/ / | |/| |
| | | * bump version to 1.3.6Gravatar Jan Tattermusch2017-05-23
| | | * Update version to 1.3.5Gravatar Ken Payson2017-05-19
| * | | regenerate projectGravatar yang-g2017-05-19
| | | * Merge pull request #11225 from apolcyn/bump_13x_versionGravatar apolcyn2017-05-18
| | | |\
| | | * \ Merge pull request #10813 from apolcyn/fix_conn_watch_mem_accumGravatar apolcyn2017-05-18
| | | |\ \
| | | | * | get rid of connectivity state watchers right after timeoutGravatar Alexander Polcyn2017-05-18
| | | | | * Bump to version 1.3.4Gravatar Alexander Polcyn2017-05-18
| | | | |/ | | | |/|
| | * | | Merge github.com:grpc/grpc into thread_poolGravatar Craig Tiller2017-05-17
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #11113 from jtattermusch/python_artifact_polling_traceGravatar Jan Tattermusch2017-05-17
| |\ \ \ \
| | | * \ \ Merge github.com:grpc/grpc into thread_poolGravatar Craig Tiller2017-05-16
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | * | | | regenerate projectsGravatar Jan Tattermusch2017-05-16
| | | | * | Bump to version 1.3.3Gravatar Ken Payson2017-05-16
| * | | | | Move workaround_list to grpc_baseGravatar Muxi Yan2017-05-15
| * | | | | Revert "Revert "Implement Server Backward Compatibility""Gravatar Muxi Yan2017-05-15
| |/ / / /
| * | | | Revert "Implement Server Backward Compatibility"Gravatar Nicolas Noble2017-05-12
| * | | | Merge pull request #10849 from muxi/backward-compatGravatar Muxi Yan2017-05-12
| |\ \ \ \
| | | * | | Remove workqueue, covered_by_poller as concepts, get Mac build upGravatar Craig Tiller2017-05-12
| | |/ / / | |/| | |
| | | * | Bump to version 1.3.2Gravatar Stanley Cheung2017-05-10
| | | * | Bump to 1.3.2-pre1Gravatar Stanley Cheung2017-05-09
| | * | | Add a separate test case for workaround_cronet_compressionGravatar Muxi Yan2017-05-09
| | * | | Put workaround list somewhere accessable by wrapping languagesGravatar Muxi Yan2017-05-09
| | * | | Merge remote-tracking branch 'upstream/master' into backward-compatGravatar Muxi Yan2017-05-05
| | |\ \ \
| * | \ \ \ Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpollGravatar Craig Tiller2017-05-05
| |\ \ \ \ \
| | * | | | | Separate this into a new pollerGravatar Sree Kuchibhotla2017-05-05
| | | |/ / / | | |/| | |
| * | | | | Fix deps between grpc and tracer systemGravatar Craig Tiller2017-05-05
| * | | | | Finish merge, disable new pollers until they stabilizeGravatar Craig Tiller2017-05-05
| * | | | | Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpollGravatar Craig Tiller2017-05-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'epex4' into uberpollGravatar Craig Tiller2017-05-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'timer_pool' into uberpollGravatar Craig Tiller2017-05-05
| |\ \ \ \ \ \ \
| | | | | | | * | Update version to 1.3.1Gravatar murgatroid992017-05-04
| | | | * | | | | Merge branch 'master' into epoll_thread_poolGravatar Sree Kuchibhotla2017-05-03
| | | | |\| | | |
| | * | | | | | | Merge github.com:grpc/grpc into timer_poolGravatar Craig Tiller2017-05-03
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| * | | | | | | | Merge github.com:grpc/grpc into hiertuneGravatar Craig Tiller2017-05-03
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | | | * | | | New epoll-based polling engine with dedicated poller threadsGravatar Sree Kuchibhotla2017-05-02
| | | * | | | | | Isolate timer checking in its own threadGravatar Craig Tiller2017-05-02
| | | | |/ / / / | | | |/| | | |
* | | | | | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_mapGravatar Vizerai2017-05-02
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | | * | | | | Implement client-side load reporting for grpclb.Gravatar Mark D. Roth2017-05-02
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #10360 from dgquintas/grpclb_new_testGravatar David G. Quintas2017-05-02
| |\ \ \ \ \ \
| | | | * \ \ \ Merge github.com:grpc/grpc into epex4Gravatar Craig Tiller2017-05-01
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | | | * | | | Merge branch 'hiertune' into epex4+epoll1Gravatar Craig Tiller2017-05-01
| | | | |\ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | Remove leftover thrift mentionsGravatar David Garcia Quintas2017-05-01
| | | | | * | | regenerateGravatar Muxi Yan2017-04-30
| | | | | * | | Merge remote-tracking branch 'upstream/master' into backward-compatGravatar Muxi Yan2017-04-30
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |