Merge branch 'next'

author Sage Weil <sage@newdream.net>

Wed, 29 Feb 2012 01:04:55 +0000 (17:04 -0800)

committer Sage Weil <sage@newdream.net>

Wed, 29 Feb 2012 01:04:55 +0000 (17:04 -0800)
author Sage Weil <sage@newdream.net>
Wed, 29 Feb 2012 01:04:55 +0000 (17:04 -0800)
committer Sage Weil <sage@newdream.net>
Wed, 29 Feb 2012 01:04:55 +0000 (17:04 -0800)
diff --cc src/Makefile.am
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 29 Feb 2012 01:04:55 +0000 (17:04 -0800)
committer	Sage Weil <sage@newdream.net>
	Wed, 29 Feb 2012 01:04:55 +0000 (17:04 -0800)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history