Merge pull request #45374 from ronen-fr/wip-rf-42684-pacific

author Yuri Weinstein <yweinste@redhat.com>

Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)

committer GitHub <noreply@github.com>

Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)
committer GitHub <noreply@github.com>
Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PeeringState.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)
committer	GitHub <noreply@github.com>
	Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PeeringState.cc	patch \|	diff1 \|	diff2 \|	blob \| history