Merge pull request #18364 from kmroz/wip-21544-luminous

author Sage Weil <sage@newdream.net>

Thu, 26 Oct 2017 21:14:07 +0000 (16:14 -0500)

committer GitHub <noreply@github.com>

Thu, 26 Oct 2017 21:14:07 +0000 (16:14 -0500)
author Sage Weil <sage@newdream.net>
Thu, 26 Oct 2017 21:14:07 +0000 (16:14 -0500)
committer GitHub <noreply@github.com>
Thu, 26 Oct 2017 21:14:07 +0000 (16:14 -0500)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 26 Oct 2017 21:14:07 +0000 (16:14 -0500)
committer	GitHub <noreply@github.com>
	Thu, 26 Oct 2017 21:14:07 +0000 (16:14 -0500)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history