Merge branch 'wip-atomic-get'

author Yehuda Sadeh <yehuda@hq.newdream.net>

Mon, 8 Aug 2011 21:19:39 +0000 (14:19 -0700)

committer Yehuda Sadeh <yehuda@hq.newdream.net>

Mon, 8 Aug 2011 21:19:39 +0000 (14:19 -0700)
author Yehuda Sadeh <yehuda@hq.newdream.net>
Mon, 8 Aug 2011 21:19:39 +0000 (14:19 -0700)
committer Yehuda Sadeh <yehuda@hq.newdream.net>
Mon, 8 Aug 2011 21:19:39 +0000 (14:19 -0700)
diff --cc src/include/rados/librados.h
Simple merge
diff --cc src/include/rados/librados.hpp
Simple merge
diff --cc src/librados.cc
Simple merge
author	Yehuda Sadeh <yehuda@hq.newdream.net>
	Mon, 8 Aug 2011 21:19:39 +0000 (14:19 -0700)
committer	Yehuda Sadeh <yehuda@hq.newdream.net>
	Mon, 8 Aug 2011 21:19:39 +0000 (14:19 -0700)
		1	2
src/include/rados/librados.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/rados/librados.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history