]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge backport pull request #5031 into wip-14077-hammer
authorDavid Zafman <dzafman@redhat.com>
Thu, 25 Feb 2016 22:25:17 +0000 (14:25 -0800)
committerDavid Zafman <dzafman@redhat.com>
Thu, 25 Feb 2016 22:25:17 +0000 (14:25 -0800)

Trivial merge