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)
commit0a7511a69ea6ca8ff32d392edf027e31aa614716
tree8567aad131d8872fef5927124ab7b38da129d7b0
parentcd120abbdedc3079ee9f318d3311d491da54af35
parente2fba3ab0b1ae27fbaf607343be155527c1e8e49
Merge branch 'master' of https://github.com/albert-chang0/fio

* '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
Makefile