Merge pull request #37048 from trociny/wip-47363-octopus

author Yuri Weinstein <yweinste@redhat.com>

Thu, 8 Oct 2020 18:54:02 +0000 (11:54 -0700)

committer GitHub <noreply@github.com>

Thu, 8 Oct 2020 18:54:02 +0000 (11:54 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 8 Oct 2020 18:54:02 +0000 (11:54 -0700)
committer GitHub <noreply@github.com>
Thu, 8 Oct 2020 18:54:02 +0000 (11:54 -0700)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 8 Oct 2020 18:54:02 +0000 (11:54 -0700)
committer	GitHub <noreply@github.com>
	Thu, 8 Oct 2020 18:54:02 +0000 (11:54 -0700)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history