From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Aug 2014 04:15:26 +0000 (-0700)
Subject: Merge pull request #2231 from ceph/wip-8944-firefly
X-Git-Tag: v0.80.6~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39bcafa6f2b14e4e11e1541cf01f24525e2b6449;p=ceph.git

Merge pull request #2231 from ceph/wip-8944-firefly

Wip 8944 firefly

Reviewed-by: Sage Weil <sage@redhat.com>
---

39bcafa6f2b14e4e11e1541cf01f24525e2b6449