Merge pull request #53188 from batrick/wip-62607-quincy

author Yuri Weinstein <yweinste@redhat.com>

Mon, 9 Oct 2023 18:29:30 +0000 (11:29 -0700)

committer GitHub <noreply@github.com>

Mon, 9 Oct 2023 18:29:30 +0000 (11:29 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 9 Oct 2023 18:29:30 +0000 (11:29 -0700)
committer GitHub <noreply@github.com>
Mon, 9 Oct 2023 18:29:30 +0000 (11:29 -0700)
diff --cc src/mon/MonClient.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 9 Oct 2023 18:29:30 +0000 (11:29 -0700)
committer	GitHub <noreply@github.com>
	Mon, 9 Oct 2023 18:29:30 +0000 (11:29 -0700)
		1	2
src/mon/MonClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history