Merge pull request #7477 from xiexingguo/wip-fix-obj

author Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 13:36:40 +0000 (08:36 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 4 Feb 2016 13:36:40 +0000 (08:36 -0500)
author Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 13:36:40 +0000 (08:36 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 4 Feb 2016 13:36:40 +0000 (08:36 -0500)
diff --cc src/librados/IoCtxImpl.cc
Simple merge
diff --cc src/librados/IoCtxImpl.h
Simple merge
diff --cc src/librados/librados.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 13:36:40 +0000 (08:36 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 4 Feb 2016 13:36:40 +0000 (08:36 -0500)
		1	2
src/librados/IoCtxImpl.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados/IoCtxImpl.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history