Merge pull request #11293 from liewegas/wip-mon-markout

author Kefu Chai <tchaikov@gmail.com>

Fri, 11 Nov 2016 14:00:39 +0000 (22:00 +0800)

committer GitHub <noreply@github.com>

Fri, 11 Nov 2016 14:00:39 +0000 (22:00 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 11 Nov 2016 14:00:39 +0000 (22:00 +0800)
committer GitHub <noreply@github.com>
Fri, 11 Nov 2016 14:00:39 +0000 (22:00 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 11 Nov 2016 14:00:39 +0000 (22:00 +0800)
committer	GitHub <noreply@github.com>
	Fri, 11 Nov 2016 14:00:39 +0000 (22:00 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history