git.apps.os.sepia.ceph.com Git

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

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)
commit	b151597efae3a06e1262a21571f59fa0185bc8d1
tree	6d7ad17519e8c0e7b2e720981d7337d63a979564	tree \| snapshot
parent	c4981b8128f70b74918ca8831cde2f568502caa0	commit \| diff
parent	193e2ea532e9b18291ef2cf56b6423ce2d5487c2	commit \| diff
parent	f299be00f781ba4c7028cf28e3725527c2fa8d83	commit \| diff

Merge branches 'wip_persist_missing' and 'wip_recovery_qos'

Reviewed-by: Sage Weil <sage@inktank.com>

src/osd/PG.cc	diff1 \|	diff2 \|	diff3 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	diff3 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

src/osd/PG.cc	diff1 \|	diff2 \|	diff3 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	diff3 \|	blob \| history