Merge pull request #16388 from xiexingguo/wip-class-misc-fixes

author Sage Weil <sage@newdream.net>

Thu, 27 Jul 2017 16:04:33 +0000 (11:04 -0500)

committer GitHub <noreply@github.com>

Thu, 27 Jul 2017 16:04:33 +0000 (11:04 -0500)
author Sage Weil <sage@newdream.net>
Thu, 27 Jul 2017 16:04:33 +0000 (11:04 -0500)
committer GitHub <noreply@github.com>
Thu, 27 Jul 2017 16:04:33 +0000 (11:04 -0500)
diff --cc doc/release-notes.rst
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 27 Jul 2017 16:04:33 +0000 (11:04 -0500)
committer	GitHub <noreply@github.com>
	Thu, 27 Jul 2017 16:04:33 +0000 (11:04 -0500)
		1	2
doc/release-notes.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history