Merge pull request #57068 from batrick/wip-65376-quincy

author SrinivasaBharathKanta <61141011+SrinivasaBharath@users.noreply.github.com>

Mon, 4 Nov 2024 07:50:35 +0000 (13:20 +0530)

committer GitHub <noreply@github.com>

Mon, 4 Nov 2024 07:50:35 +0000 (13:20 +0530)
author SrinivasaBharathKanta <61141011+SrinivasaBharath@users.noreply.github.com>
Mon, 4 Nov 2024 07:50:35 +0000 (13:20 +0530)
committer GitHub <noreply@github.com>
Mon, 4 Nov 2024 07:50:35 +0000 (13:20 +0530)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	SrinivasaBharathKanta <61141011+SrinivasaBharath@users.noreply.github.com>
	Mon, 4 Nov 2024 07:50:35 +0000 (13:20 +0530)
committer	GitHub <noreply@github.com>
	Mon, 4 Nov 2024 07:50:35 +0000 (13:20 +0530)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history