Merge pull request #4210 from trociny/fix-11261

author Kefu Chai <tchaikov@gmail.com>

Wed, 8 Apr 2015 07:19:29 +0000 (15:19 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Wed, 8 Apr 2015 07:19:29 +0000 (15:19 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 8 Apr 2015 07:19:29 +0000 (15:19 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Wed, 8 Apr 2015 07:19:29 +0000 (15:19 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/rbd.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 8 Apr 2015 07:19:29 +0000 (15:19 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Wed, 8 Apr 2015 07:19:29 +0000 (15:19 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history