Merge pull request #21102 from trociny/wip-23487

author Sage Weil <sage@newdream.net>

Wed, 11 Apr 2018 15:49:09 +0000 (10:49 -0500)

committer GitHub <noreply@github.com>

Wed, 11 Apr 2018 15:49:09 +0000 (10:49 -0500)
author Sage Weil <sage@newdream.net>
Wed, 11 Apr 2018 15:49:09 +0000 (10:49 -0500)
committer GitHub <noreply@github.com>
Wed, 11 Apr 2018 15:49:09 +0000 (10:49 -0500)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 11 Apr 2018 15:49:09 +0000 (10:49 -0500)
committer	GitHub <noreply@github.com>
	Wed, 11 Apr 2018 15:49:09 +0000 (10:49 -0500)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history