Merge pull request #6488 from xiexingguo/xxg-wip-rados-cleanup

author Kefu Chai <tchaikov@gmail.com>

Tue, 10 Nov 2015 16:56:40 +0000 (00:56 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Tue, 10 Nov 2015 16:56:40 +0000 (00:56 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 10 Nov 2015 16:56:40 +0000 (00:56 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Tue, 10 Nov 2015 16:56:40 +0000 (00:56 +0800)
diff --cc src/librados/librados.cc
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 10 Nov 2015 16:56:40 +0000 (00:56 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Tue, 10 Nov 2015 16:56:40 +0000 (00:56 +0800)
		1	2
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history