Merge remote-tracking branch 'origin/wip_prefix' into wip-rgw-omap

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

Thu, 8 Mar 2012 00:46:18 +0000 (16:46 -0800)

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

Thu, 8 Mar 2012 00:46:18 +0000 (16:46 -0800)
author Yehuda Sadeh <yehuda@hq.newdream.net>
Thu, 8 Mar 2012 00:46:18 +0000 (16:46 -0800)
committer Yehuda Sadeh <yehuda@hq.newdream.net>
Thu, 8 Mar 2012 00:46:18 +0000 (16:46 -0800)
diff --cc src/include/rados/librados.hpp
Simple merge
diff --cc src/librados.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Yehuda Sadeh <yehuda@hq.newdream.net>
	Thu, 8 Mar 2012 00:46:18 +0000 (16:46 -0800)
committer	Yehuda Sadeh <yehuda@hq.newdream.net>
	Thu, 8 Mar 2012 00:46:18 +0000 (16:46 -0800)
		1	2
src/include/rados/librados.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history