From: Sage Weil <sage@inktank.com>
Date: Sun, 23 Feb 2014 15:38:43 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/firefly'
X-Git-Tag: v0.79~199
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e50f7a0afef3dc12721b217fddb6e8737281a60;p=ceph.git

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

0e50f7a0afef3dc12721b217fddb6e8737281a60