Merge pull request #38479 from neha-ojha/wip-37503-2

author Josh Durgin <jdurgin@redhat.com>

Tue, 15 Dec 2020 20:06:39 +0000 (12:06 -0800)

committer GitHub <noreply@github.com>

Tue, 15 Dec 2020 20:06:39 +0000 (12:06 -0800)
author Josh Durgin <jdurgin@redhat.com>
Tue, 15 Dec 2020 20:06:39 +0000 (12:06 -0800)
committer GitHub <noreply@github.com>
Tue, 15 Dec 2020 20:06:39 +0000 (12:06 -0800)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Tue, 15 Dec 2020 20:06:39 +0000 (12:06 -0800)
committer	GitHub <noreply@github.com>
	Tue, 15 Dec 2020 20:06:39 +0000 (12:06 -0800)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history