From: Andrew Schoen <andrew.schoen@gmail.com>
Date: Mon, 29 Jun 2015 22:00:21 +0000 (-0500)
Subject: Merge pull request #550 from ceph/wip-bz-1233329
X-Git-Tag: 1.1.0~899
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76247bdf72c2c9417b6213d34f76dcc00d9c90e3;p=teuthology.git

Merge pull request #550 from ceph/wip-bz-1233329

Work around BZ 1233329
---

76247bdf72c2c9417b6213d34f76dcc00d9c90e3