Merge pull request #6893 from kylinstorage/wip-osd_command

author Sage Weil <sage@redhat.com>

Thu, 31 Dec 2015 14:33:51 +0000 (09:33 -0500)

committer Sage Weil <sage@redhat.com>

Thu, 31 Dec 2015 14:33:51 +0000 (09:33 -0500)
author Sage Weil <sage@redhat.com>
Thu, 31 Dec 2015 14:33:51 +0000 (09:33 -0500)
committer Sage Weil <sage@redhat.com>
Thu, 31 Dec 2015 14:33:51 +0000 (09:33 -0500)
diff --cc src/include/rados/librados.hpp
Simple merge
diff --cc src/librados/librados.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 31 Dec 2015 14:33:51 +0000 (09:33 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 31 Dec 2015 14:33:51 +0000 (09:33 -0500)
		1	2
src/include/rados/librados.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history