From: Sage Weil <sage@inktank.com>
Date: Tue, 26 Mar 2013 18:34:33 +0000 (-0700)
Subject: Merge branch 'wip-lock'
X-Git-Tag: 1.1.0~2220
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=86230f15cf247bf13e4d9e4f984c2b987c264419;p=teuthology.git

Merge branch 'wip-lock'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

86230f15cf247bf13e4d9e4f984c2b987c264419