From: Andrew Schoen <andrew.schoen@gmail.com>
Date: Mon, 11 Jan 2016 20:13:38 +0000 (-0600)
Subject: Merge pull request #767 from ceph/wip-14336
X-Git-Tag: 1.1.0~703
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1a74f929430ee1976a7696d837cc3edb407c7f36;p=teuthology.git

Merge pull request #767 from ceph/wip-14336

Fix regression in flock usage
---

1a74f929430ee1976a7696d837cc3edb407c7f36