Merge PR #25470 into master

author Sage Weil <sage@redhat.com>

Tue, 18 Dec 2018 22:21:27 +0000 (16:21 -0600)

committer Sage Weil <sage@redhat.com>

Tue, 18 Dec 2018 22:21:27 +0000 (16:21 -0600)
author Sage Weil <sage@redhat.com>
Tue, 18 Dec 2018 22:21:27 +0000 (16:21 -0600)
committer Sage Weil <sage@redhat.com>
Tue, 18 Dec 2018 22:21:27 +0000 (16:21 -0600)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 18 Dec 2018 22:21:27 +0000 (16:21 -0600)
committer	Sage Weil <sage@redhat.com>
	Tue, 18 Dec 2018 22:21:27 +0000 (16:21 -0600)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history