Merge branch 'wip-4201' into next

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

Sat, 20 Apr 2013 01:14:28 +0000 (18:14 -0700)

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

Sat, 20 Apr 2013 01:14:28 +0000 (18:14 -0700)
author David Zafman <david.zafman@inktank.com>
Sat, 20 Apr 2013 01:14:28 +0000 (18:14 -0700)
committer David Zafman <david.zafman@inktank.com>
Sat, 20 Apr 2013 01:14:28 +0000 (18:14 -0700)
diff --cc src/os/FileStore.cc
Simple merge
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>
	Sat, 20 Apr 2013 01:14:28 +0000 (18:14 -0700)
committer	David Zafman <david.zafman@inktank.com>
	Sat, 20 Apr 2013 01:14:28 +0000 (18:14 -0700)
		1	2
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
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