Merge pull request #21174 from guzhongyan/crush-log-cleanup

author Kefu Chai <tchaikov@gmail.com>

Fri, 13 Apr 2018 09:42:44 +0000 (17:42 +0800)

committer GitHub <noreply@github.com>

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