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

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

b70db7e735bb6e8192211c301245f7a10ead534e