Merge PR #22940 into master

author Sage Weil <sage@redhat.com>

Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)

committer Sage Weil <sage@redhat.com>

Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)
author Sage Weil <sage@redhat.com>
Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)
committer Sage Weil <sage@redhat.com>
Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)
committer	Sage Weil <sage@redhat.com>
	Tue, 10 Jul 2018 13:42:27 +0000 (08:42 -0500)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history