From: David Zafman <dzafman@redhat.com>
Date: Thu, 25 Feb 2016 22:24:31 +0000 (-0800)
Subject: Merge backport pull request #5127 into wip-14077-hammer
X-Git-Tag: v0.94.7~28^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de5e11ec69e7388a1a9c28614759b2e2d8b70ad8;p=ceph.git

Merge backport pull request #5127 into wip-14077-hammer
---

de5e11ec69e7388a1a9c28614759b2e2d8b70ad8