Merge pull request #10916 from jordan41177/fix-17169

author Kefu Chai <tchaikov@gmail.com>

Mon, 10 Oct 2016 06:39:56 +0000 (14:39 +0800)

committer GitHub <noreply@github.com>

Mon, 10 Oct 2016 06:39:56 +0000 (14:39 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 10 Oct 2016 06:39:56 +0000 (14:39 +0800)
committer GitHub <noreply@github.com>
Mon, 10 Oct 2016 06:39:56 +0000 (14:39 +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, 10 Oct 2016 06:39:56 +0000 (14:39 +0800)
committer	GitHub <noreply@github.com>
	Mon, 10 Oct 2016 06:39:56 +0000 (14:39 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history