]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/luminous' into luminous
authorAlfredo Deza <adeza@redhat.com>
Fri, 1 Dec 2017 14:57:44 +0000 (09:57 -0500)
committerAlfredo Deza <adeza@redhat.com>
Fri, 1 Dec 2017 14:57:44 +0000 (09:57 -0500)

Trivial merge