Merge remote branch 'gh/wip-pg-states'

author Sage Weil <sage@newdream.net>

Sat, 18 Feb 2012 22:00:50 +0000 (14:00 -0800)

committer Sage Weil <sage@newdream.net>

Sat, 18 Feb 2012 22:00:50 +0000 (14:00 -0800)
author Sage Weil <sage@newdream.net>
Sat, 18 Feb 2012 22:00:50 +0000 (14:00 -0800)
committer Sage Weil <sage@newdream.net>
Sat, 18 Feb 2012 22:00:50 +0000 (14:00 -0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 18 Feb 2012 22:00:50 +0000 (14:00 -0800)
committer	Sage Weil <sage@newdream.net>
	Sat, 18 Feb 2012 22:00:50 +0000 (14:00 -0800)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history