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

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

4309fa87e13a20368ca34f7699436b628c9d7876