From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Mar 2014 23:19:07 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/firefly'
X-Git-Tag: v0.79~138
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1048763e33a4423e52fb8fc610a28dd55464f1c5;p=ceph.git

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

1048763e33a4423e52fb8fc610a28dd55464f1c5