Merge pull request #50978 from batrick/i59295

author Yuri Weinstein <yweinste@redhat.com>

Wed, 3 May 2023 22:12:22 +0000 (15:12 -0700)

committer GitHub <noreply@github.com>

Wed, 3 May 2023 22:12:22 +0000 (15:12 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 3 May 2023 22:12:22 +0000 (15:12 -0700)
committer GitHub <noreply@github.com>
Wed, 3 May 2023 22:12:22 +0000 (15:12 -0700)
diff --cc src/mon/MgrMap.h
Simple merge
diff --cc src/mon/MgrMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 3 May 2023 22:12:22 +0000 (15:12 -0700)
committer	GitHub <noreply@github.com>
	Wed, 3 May 2023 22:12:22 +0000 (15:12 -0700)
		1	2
src/mon/MgrMap.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MgrMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history