Merge branch 'wip-rbd-stripe' (early part)

author Sage Weil <sage@inktank.com>

Thu, 18 Oct 2012 23:42:15 +0000 (16:42 -0700)

committer Sage Weil <sage@inktank.com>

Thu, 18 Oct 2012 23:42:15 +0000 (16:42 -0700)
author Sage Weil <sage@inktank.com>
Thu, 18 Oct 2012 23:42:15 +0000 (16:42 -0700)
committer Sage Weil <sage@inktank.com>
Thu, 18 Oct 2012 23:42:15 +0000 (16:42 -0700)
diff --cc src/Makefile.am
Simple merge
diff --cc src/client/Client.cc
Simple merge
diff --cc src/rbd.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 18 Oct 2012 23:42:15 +0000 (16:42 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 18 Oct 2012 23:42:15 +0000 (16:42 -0700)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rbd.cc	patch \|	diff1 \|	diff2 \|	blob \| history