Merge pull request #45173 from kamoltat/wip-ksirivad-backport-pacific-44054

author Yuri Weinstein <yweinste@redhat.com>

Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)

committer GitHub <noreply@github.com>

Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)
committer GitHub <noreply@github.com>
Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)
committer	GitHub <noreply@github.com>
	Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history