]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'ceph/hammer'
authorLoic Dachary <ldachary@redhat.com>
Thu, 12 Feb 2015 00:08:07 +0000 (01:08 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 12 Feb 2015 00:08:07 +0000 (01:08 +0100)

Trivial merge