Merge pull request #6202 from cxwshawn/wip-ful-fix

author Sage Weil <sage@redhat.com>

Thu, 17 Dec 2015 13:58:53 +0000 (08:58 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 17 Dec 2015 13:58:53 +0000 (08:58 -0500)
author Sage Weil <sage@redhat.com>
Thu, 17 Dec 2015 13:58:53 +0000 (08:58 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 17 Dec 2015 13:58:53 +0000 (08:58 -0500)
diff --cc src/include/rados/librados.hpp
Simple merge
diff --cc src/librados/librados.cc
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 17 Dec 2015 13:58:53 +0000 (08:58 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 17 Dec 2015 13:58:53 +0000 (08:58 -0500)
		1	2
src/include/rados/librados.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history