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

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

author	Josh Durgin <josh.durgin@inktank.com>
	Wed, 13 Feb 2013 00:55:32 +0000 (16:55 -0800)
committer	Josh Durgin <josh.durgin@inktank.com>
	Wed, 13 Feb 2013 00:55:32 +0000 (16:55 -0800)
commit	0fec0fde4239e8410ed0103726d8db5a9768dad4
tree	5818165f17c74fd6d30b49920a83e9cc57c8e039	tree \| snapshot
parent	188f3ea6867eeb6e950f6efed18d53ff17522bbc	commit \| diff
parent	fe283813b44a7c45def6768ea0788a3a0635957e	commit \| diff

Merge branch 'next'

Conflicts:
src/include/ceph_features.h

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