Merge pull request #46036 from ifed01/wip-ifed-new-statfs-update

author Laura Flores <lflores@redhat.com>

Thu, 10 Nov 2022 19:23:50 +0000 (13:23 -0600)

committer GitHub <noreply@github.com>

Thu, 10 Nov 2022 19:23:50 +0000 (13:23 -0600)
author Laura Flores <lflores@redhat.com>
Thu, 10 Nov 2022 19:23:50 +0000 (13:23 -0600)
committer GitHub <noreply@github.com>
Thu, 10 Nov 2022 19:23:50 +0000 (13:23 -0600)
diff --cc src/common/options/global.yaml.in
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Laura Flores <lflores@redhat.com>
	Thu, 10 Nov 2022 19:23:50 +0000 (13:23 -0600)
committer	GitHub <noreply@github.com>
	Thu, 10 Nov 2022 19:23:50 +0000 (13:23 -0600)
		1	2
src/common/options/global.yaml.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history