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

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

5676d6e5beb6584fa000db5a9fb517d4301b608c