From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 12 Feb 2015 00:08:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'ceph/hammer'
X-Git-Tag: v0.93~51^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96f1fe04a04478bac3b7664eb5edd999eb846159;p=ceph.git

Merge remote-tracking branch 'ceph/hammer'
---

96f1fe04a04478bac3b7664eb5edd999eb846159