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

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

author	Samuel Just <sam.just@inktank.com>
	Mon, 8 Jul 2013 23:46:31 +0000 (16:46 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Mon, 8 Jul 2013 23:53:17 +0000 (16:53 -0700)
commit	0e93dd93e5439fb82c416cb8eec7f36598ae7b48
tree	f2322521f44cc8bd86918c91415d0d4e0a32cac3	tree \| snapshot
parent	a9906641a1dce150203b72682da05651e4d68ff5	commit \| diff
parent	ad65de40ffad5cecb959f710e9bceb8accc2ae3b	commit \| diff

Merge branch 'wip-small-object-recovery'

Conflicts:
src/include/ceph_features.h

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

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