From: Loic Dachary <loic@dachary.org>
Date: Mon, 18 May 2015 12:25:59 +0000 (+0200)
Subject: Merge pull request #4697 from ceph/wip-11622-firefly
X-Git-Tag: v0.80.10~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68211f695941ee128eb9a7fd0d80b615c0ded6cf;p=ceph.git

Merge pull request #4697 from ceph/wip-11622-firefly

Wip 11622 firefly

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

68211f695941ee128eb9a7fd0d80b615c0ded6cf