From: Sage Weil <sage@inktank.com>
Date: Tue, 18 Mar 2014 22:01:04 +0000 (-0700)
Subject: Merge branch 'firefly'
X-Git-Tag: 1.1.0~1583
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5679ae2a1ff06e764a3e6ed7e895ac614d8d08a0;p=teuthology.git

Merge branch 'firefly'
---

5679ae2a1ff06e764a3e6ed7e895ac614d8d08a0