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

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

0e0a9dbfde1a899f338e665e827ad367e2e81c35