Merge pull request #29674 from athanatos/sjust/wip-fio-trace

author Samuel Just <sjust@redhat.com>

Mon, 30 Sep 2019 21:15:31 +0000 (14:15 -0700)

committer GitHub <noreply@github.com>

Mon, 30 Sep 2019 21:15:31 +0000 (14:15 -0700)
author Samuel Just <sjust@redhat.com>
Mon, 30 Sep 2019 21:15:31 +0000 (14:15 -0700)
committer GitHub <noreply@github.com>
Mon, 30 Sep 2019 21:15:31 +0000 (14:15 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Mon, 30 Sep 2019 21:15:31 +0000 (14:15 -0700)
committer	GitHub <noreply@github.com>
	Mon, 30 Sep 2019 21:15:31 +0000 (14:15 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history