Merge branches 'wip_persist_missing' and 'wip_recovery_qos'

author Samuel Just <sam.just@inktank.com>

Tue, 13 Nov 2012 18:56:22 +0000 (10:56 -0800)

committer Samuel Just <sam.just@inktank.com>

Tue, 13 Nov 2012 18:56:41 +0000 (10:56 -0800)
author Samuel Just <sam.just@inktank.com>
Tue, 13 Nov 2012 18:56:22 +0000 (10:56 -0800)
committer Samuel Just <sam.just@inktank.com>
Tue, 13 Nov 2012 18:56:41 +0000 (10:56 -0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Tue, 13 Nov 2012 18:56:22 +0000 (10:56 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Tue, 13 Nov 2012 18:56:41 +0000 (10:56 -0800)
		1	2	3
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history