Merge pull request #16837 from xiexingguo/wip-still-more-class-fixes

author Sage Weil <sage@newdream.net>

Sun, 6 Aug 2017 19:07:33 +0000 (14:07 -0500)

committer GitHub <noreply@github.com>

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