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

Merge backport branch 'wip-temp' into wip-14077-hammer
---

c8057c693bf0ae7bb01ef238f4ef9f23454a2e33