Merge branch 'wip-pools'

author Sage Weil <sage@newdream.net>

Tue, 25 Oct 2011 21:02:42 +0000 (14:02 -0700)

committer Sage Weil <sage@newdream.net>

Tue, 25 Oct 2011 21:02:42 +0000 (14:02 -0700)
author Sage Weil <sage@newdream.net>
Tue, 25 Oct 2011 21:02:42 +0000 (14:02 -0700)
committer Sage Weil <sage@newdream.net>
Tue, 25 Oct 2011 21:02:42 +0000 (14:02 -0700)
diff --cc src/librados.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 25 Oct 2011 21:02:42 +0000 (14:02 -0700)
committer	Sage Weil <sage@newdream.net>
	Tue, 25 Oct 2011 21:02:42 +0000 (14:02 -0700)
		1	2
src/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history