]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'ceph/jewel-next' into jewel
authorLoic Dachary <ldachary@redhat.com>
Wed, 21 Dec 2016 23:18:11 +0000 (00:18 +0100)
committerLoic Dachary <ldachary@redhat.com>
Wed, 21 Dec 2016 23:18:11 +0000 (00:18 +0100)

Trivial merge