Merge pull request #52458 from kamoltat/wip-ksirivad-backport-quincy-48209

author Yuri Weinstein <yweinste@redhat.com>

Mon, 8 Jan 2024 20:06:50 +0000 (12:06 -0800)

committer GitHub <noreply@github.com>

Mon, 8 Jan 2024 20:06:50 +0000 (12:06 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 8 Jan 2024 20:06:50 +0000 (12:06 -0800)
committer GitHub <noreply@github.com>
Mon, 8 Jan 2024 20:06:50 +0000 (12:06 -0800)
diff --cc doc/rados/operations/health-checks.rst
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 8 Jan 2024 20:06:50 +0000 (12:06 -0800)
committer	GitHub <noreply@github.com>
	Mon, 8 Jan 2024 20:06:50 +0000 (12:06 -0800)
		1	2
doc/rados/operations/health-checks.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history