Merge branch 'master' of https://github.com/albert-chang0/fio
authorJens Axboe <axboe@kernel.dk>
Thu, 5 Nov 2020 22:17:11 +0000 (15:17 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 5 Nov 2020 22:17:11 +0000 (15:17 -0700)
* 'master' of https://github.com/albert-chang0/fio:
  engines/hdfs: swap fio_hdfsio_init and fio_hdfsio_io_u_init
  Makefile: fix usage of JAVA_HOME environmental variable

1  2 
Makefile

diff --cc Makefile
Simple merge