Merge pull request #45324 from ljflores/wip-54468-octopus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 11 May 2022 16:15:48 +0000 (09:15 -0700)

committer GitHub <noreply@github.com>

Wed, 11 May 2022 16:15:48 +0000 (09:15 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 11 May 2022 16:15:48 +0000 (09:15 -0700)
committer GitHub <noreply@github.com>
Wed, 11 May 2022 16:15:48 +0000 (09:15 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 11 May 2022 16:15:48 +0000 (09:15 -0700)
committer	GitHub <noreply@github.com>
	Wed, 11 May 2022 16:15:48 +0000 (09:15 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history