Merge branch 'wip-4273'

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

Fri, 10 May 2013 23:44:19 +0000 (16:44 -0700)

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

Fri, 10 May 2013 23:45:34 +0000 (16:45 -0700)
author David Zafman <david.zafman@inktank.com>
Fri, 10 May 2013 23:44:19 +0000 (16:44 -0700)
committer David Zafman <david.zafman@inktank.com>
Fri, 10 May 2013 23:45:34 +0000 (16:45 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	David Zafman <david.zafman@inktank.com>
	Fri, 10 May 2013 23:44:19 +0000 (16:44 -0700)
committer	David Zafman <david.zafman@inktank.com>
	Fri, 10 May 2013 23:45:34 +0000 (16:45 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history