Merge pull request #3887 from stiopaa1/feature10891

author Kefu Chai <tchaikov@gmail.com>

Tue, 10 Mar 2015 14:16:29 +0000 (22:16 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Tue, 10 Mar 2015 14:16:29 +0000 (22:16 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 10 Mar 2015 14:16:29 +0000 (22:16 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Tue, 10 Mar 2015 14:16:29 +0000 (22:16 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 10 Mar 2015 14:16:29 +0000 (22:16 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Tue, 10 Mar 2015 14:16:29 +0000 (22:16 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history