]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis' into infernalis
authorAlfredo Deza <adeza@redhat.com>
Fri, 26 Feb 2016 13:23:58 +0000 (08:23 -0500)
committerAlfredo Deza <adeza@redhat.com>
Fri, 26 Feb 2016 13:23:58 +0000 (08:23 -0500)

Trivial merge