From: Jens Axboe Date: Thu, 5 Nov 2020 22:17:11 +0000 (-0700) Subject: Merge branch 'master' of https://github.com/albert-chang0/fio X-Git-Tag: fio-3.24~12 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0a7511a69ea6ca8ff32d392edf027e31aa614716;p=fio.git 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 --- 0a7511a69ea6ca8ff32d392edf027e31aa614716