From: Sage Weil <sage@inktank.com>
Date: Mon, 28 Apr 2014 21:13:24 +0000 (-0700)
Subject: Merge pull request #1652 from ceph/wip-5170-firefly
X-Git-Tag: v0.81~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8c5cc679ed51bc820836dc510c5d9bac0551ddd;p=ceph.git

Merge pull request #1652 from ceph/wip-5170-firefly

Wip 5170 firefly
---

d8c5cc679ed51bc820836dc510c5d9bac0551ddd