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

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

513e4ad8ec708dbee0fe59b72f1ac9f4d453fd35