Merge pull request #19673 from zouaiguo/wip_erase_code

author Kefu Chai <tchaikov@gmail.com>

Mon, 15 Jan 2018 10:34:34 +0000 (18:34 +0800)

committer GitHub <noreply@github.com>

Mon, 15 Jan 2018 10:34:34 +0000 (18:34 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 15 Jan 2018 10:34:34 +0000 (18:34 +0800)
committer GitHub <noreply@github.com>
Mon, 15 Jan 2018 10:34:34 +0000 (18:34 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 15 Jan 2018 10:34:34 +0000 (18:34 +0800)
committer	GitHub <noreply@github.com>
	Mon, 15 Jan 2018 10:34:34 +0000 (18:34 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history