From: Sage Weil <sage@inktank.com>
Date: Thu, 20 Mar 2014 23:50:15 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/firefly'
X-Git-Tag: 1.1.0~1581
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dcfdd288f4395d36376f2b43b2261ddb3de9ca8;p=teuthology.git

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

7dcfdd288f4395d36376f2b43b2261ddb3de9ca8