Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Fri, 28 Dec 2012 01:15:29 +0000 (17:15 -0800)

committer Sage Weil <sage@inktank.com>

Fri, 28 Dec 2012 01:15:29 +0000 (17:15 -0800)
author Sage Weil <sage@inktank.com>
Fri, 28 Dec 2012 01:15:29 +0000 (17:15 -0800)
committer Sage Weil <sage@inktank.com>
Fri, 28 Dec 2012 01:15:29 +0000 (17:15 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 28 Dec 2012 01:15:29 +0000 (17:15 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 28 Dec 2012 01:15:29 +0000 (17:15 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history