Merge pull request #47840 from NitzanMordhai/wip-57316-quincy

author Yuri Weinstein <yweinste@redhat.com>

Wed, 4 Oct 2023 15:33:12 +0000 (08:33 -0700)

committer GitHub <noreply@github.com>

Wed, 4 Oct 2023 15:33:12 +0000 (08:33 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 4 Oct 2023 15:33:12 +0000 (08:33 -0700)
committer GitHub <noreply@github.com>
Wed, 4 Oct 2023 15:33:12 +0000 (08:33 -0700)
diff --cc src/osd/PeeringState.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 4 Oct 2023 15:33:12 +0000 (08:33 -0700)
committer	GitHub <noreply@github.com>
	Wed, 4 Oct 2023 15:33:12 +0000 (08:33 -0700)
		1	2
src/osd/PeeringState.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history