Merge pull request #45154 from pponnuvel/wip-54386-octopus

author Yuri Weinstein <yweinste@redhat.com>

Fri, 1 Jul 2022 17:36:29 +0000 (10:36 -0700)

committer GitHub <noreply@github.com>

Fri, 1 Jul 2022 17:36:29 +0000 (10:36 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 1 Jul 2022 17:36:29 +0000 (10:36 -0700)
committer GitHub <noreply@github.com>
Fri, 1 Jul 2022 17:36:29 +0000 (10:36 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 1 Jul 2022 17:36:29 +0000 (10:36 -0700)
committer	GitHub <noreply@github.com>
	Fri, 1 Jul 2022 17:36:29 +0000 (10:36 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history