Merge pull request #50979 from batrick/i59294

author Yuri Weinstein <yweinste@redhat.com>

Mon, 22 May 2023 23:27:51 +0000 (19:27 -0400)

committer GitHub <noreply@github.com>

Mon, 22 May 2023 23:27:51 +0000 (19:27 -0400)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 22 May 2023 23:27:51 +0000 (19:27 -0400)
committer GitHub <noreply@github.com>
Mon, 22 May 2023 23:27:51 +0000 (19:27 -0400)
diff --cc src/mon/MgrMap.h
Simple merge
diff --cc src/mon/MgrMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 22 May 2023 23:27:51 +0000 (19:27 -0400)
committer	GitHub <noreply@github.com>
	Mon, 22 May 2023 23:27:51 +0000 (19:27 -0400)
		1	2
src/mon/MgrMap.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MgrMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history