From: Sage Weil <sage@inktank.com>
Date: Thu, 27 Mar 2014 04:44:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/firefly'
X-Git-Tag: v0.79~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9a2dea755a62e4f9fe0795410f37b68a15ae054;p=ceph.git

Merge remote-tracking branch 'gh/firefly'
---

d9a2dea755a62e4f9fe0795410f37b68a15ae054