From: Sage Weil <sage@inktank.com>
Date: Fri, 21 Mar 2014 16:12:40 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/firefly'
X-Git-Tag: 1.1.0~1580
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b6f93a5b24b89e340ed2a9da1aee8d18bf04739;p=teuthology.git

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

9b6f93a5b24b89e340ed2a9da1aee8d18bf04739