From: Sage Weil <sage@inktank.com>
Date: Thu, 20 Mar 2014 17:35:30 +0000 (-0700)
Subject: Merge branch 'firefly'
X-Git-Tag: 1.1.0~1582
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=daa54292781c910c4b85aba4bd7cf18f34d382c9;p=teuthology.git

Merge branch 'firefly'
---

daa54292781c910c4b85aba4bd7cf18f34d382c9