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

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

5ec493600ef8dc588f1687470b05244ffded0c4d