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

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

author	Gregory Farnum <greg@gregs42.com>
	Mon, 17 Apr 2017 21:39:59 +0000 (17:39 -0400)
committer	GitHub <noreply@github.com>
	Mon, 17 Apr 2017 21:39:59 +0000 (17:39 -0400)
commit	721b2083cd2ed8567d41aba6b17caf30b678e6b3
tree	329f9d5ca6a3d834fbbde927cf1ae9e3de33f71d	tree \| snapshot
parent	a84dc8fe747d1e17c7910c9857f7f5d3d56e2dff	commit \| diff
parent	e31a540dcea96b3d5b4f7ecd20e2d54e81a68e2b	commit \| diff

Merge branch 'jewel' into wip-jewel-snaptrim

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