Merge PR #24603 into master

author Sage Weil <sage@redhat.com>

Wed, 17 Oct 2018 15:06:26 +0000 (10:06 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 17 Oct 2018 15:06:26 +0000 (10:06 -0500)
author Sage Weil <sage@redhat.com>
Wed, 17 Oct 2018 15:06:26 +0000 (10:06 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 17 Oct 2018 15:06:26 +0000 (10:06 -0500)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 17 Oct 2018 15:06:26 +0000 (10:06 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 17 Oct 2018 15:06:26 +0000 (10:06 -0500)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history