From: Loic Dachary <loic@dachary.org>
Date: Mon, 18 May 2015 12:26:16 +0000 (+0200)
Subject: Merge pull request #4696 from ceph/wip-11622-hammer
X-Git-Tag: v0.94.2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63832d4039889b6b704b88b86eaba4aadcfceb2e;p=ceph.git

Merge pull request #4696 from ceph/wip-11622-hammer

Wip 11622 hammer

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

63832d4039889b6b704b88b86eaba4aadcfceb2e