From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 6 May 2015 20:07:11 +0000 (-0700)
Subject: Merge pull request #4571 from ceph/wip-11256-firefly
X-Git-Tag: v0.80.10~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df053b86a89edf8f390400dad8c5e654e14df327;p=ceph.git

Merge pull request #4571 from ceph/wip-11256-firefly

Wip 11256 firefly

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

df053b86a89edf8f390400dad8c5e654e14df327