Merge pull request #38168 from agayev/cleaner-plumbing

author Kefu Chai <kchai@redhat.com>

Fri, 4 Dec 2020 06:14:54 +0000 (14:14 +0800)

committer GitHub <noreply@github.com>

Fri, 4 Dec 2020 06:14:54 +0000 (14:14 +0800)
author Kefu Chai <kchai@redhat.com>
Fri, 4 Dec 2020 06:14:54 +0000 (14:14 +0800)
committer GitHub <noreply@github.com>
Fri, 4 Dec 2020 06:14:54 +0000 (14:14 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Fri, 4 Dec 2020 06:14:54 +0000 (14:14 +0800)
committer	GitHub <noreply@github.com>
	Fri, 4 Dec 2020 06:14:54 +0000 (14:14 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history