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

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

f1a1ac8243550e17c3a587f50766781e97206e29