Merge pull request #38651 from ifed01/wip-ifed-new-omap-naming

author Kefu Chai <kchai@redhat.com>

Fri, 1 Jan 2021 04:06:39 +0000 (12:06 +0800)

committer GitHub <noreply@github.com>

Fri, 1 Jan 2021 04:06:39 +0000 (12:06 +0800)
author Kefu Chai <kchai@redhat.com>
Fri, 1 Jan 2021 04:06:39 +0000 (12:06 +0800)
committer GitHub <noreply@github.com>
Fri, 1 Jan 2021 04:06:39 +0000 (12:06 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Fri, 1 Jan 2021 04:06:39 +0000 (12:06 +0800)
committer	GitHub <noreply@github.com>
	Fri, 1 Jan 2021 04:06:39 +0000 (12:06 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history