Merge remote branch 'origin/wip-scrub-oi-size'

author Josh Durgin <josh.durgin@dreamhost.com>

Wed, 31 Aug 2011 18:58:15 +0000 (11:58 -0700)

committer Josh Durgin <josh.durgin@dreamhost.com>

Wed, 31 Aug 2011 18:58:15 +0000 (11:58 -0700)
author Josh Durgin <josh.durgin@dreamhost.com>
Wed, 31 Aug 2011 18:58:15 +0000 (11:58 -0700)
committer Josh Durgin <josh.durgin@dreamhost.com>
Wed, 31 Aug 2011 18:58:15 +0000 (11:58 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Josh Durgin <josh.durgin@dreamhost.com>
	Wed, 31 Aug 2011 18:58:15 +0000 (11:58 -0700)
committer	Josh Durgin <josh.durgin@dreamhost.com>
	Wed, 31 Aug 2011 18:58:15 +0000 (11:58 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history