Merge pull request #20687 from Songweibin/wip-misc-cleanup

author Kefu Chai <tchaikov@gmail.com>

Mon, 5 Mar 2018 09:57:52 +0000 (17:57 +0800)

committer GitHub <noreply@github.com>

Mon, 5 Mar 2018 09:57:52 +0000 (17:57 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 5 Mar 2018 09:57:52 +0000 (17:57 +0800)
committer GitHub <noreply@github.com>
Mon, 5 Mar 2018 09:57:52 +0000 (17:57 +0800)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 5 Mar 2018 09:57:52 +0000 (17:57 +0800)
committer	GitHub <noreply@github.com>
	Mon, 5 Mar 2018 09:57:52 +0000 (17:57 +0800)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history