Merge branch 'wip-4778' into next

author David Zafman <david.zafman@inktank.com>

Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -0700)

committer David Zafman <david.zafman@inktank.com>

Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -0700)
author David Zafman <david.zafman@inktank.com>
Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -0700)
committer David Zafman <david.zafman@inktank.com>
Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -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
diff --cc src/osd/osd_types.h
Simple merge
author	David Zafman <david.zafman@inktank.com>
	Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -0700)
committer	David Zafman <david.zafman@inktank.com>
	Thu, 25 Apr 2013 00:33:00 +0000 (17:33 -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
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history