Merge pull request #48490 from aclamk/wip-aclamk-fix-deferred

author Yuri Weinstein <yweinste@redhat.com>

Mon, 28 Nov 2022 18:38:12 +0000 (10:38 -0800)

committer GitHub <noreply@github.com>

Mon, 28 Nov 2022 18:38:12 +0000 (10:38 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 28 Nov 2022 18:38:12 +0000 (10:38 -0800)
committer GitHub <noreply@github.com>
Mon, 28 Nov 2022 18:38:12 +0000 (10:38 -0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 28 Nov 2022 18:38:12 +0000 (10:38 -0800)
committer	GitHub <noreply@github.com>
	Mon, 28 Nov 2022 18:38:12 +0000 (10:38 -0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history