Merge branch 'ci' of https://github.com/sitsofe/fio
authorJens Axboe <axboe@kernel.dk>
Mon, 14 Aug 2017 14:32:56 +0000 (08:32 -0600)
committerJens Axboe <axboe@kernel.dk>
Mon, 14 Aug 2017 14:32:56 +0000 (08:32 -0600)

Trivial merge