From: Loic Dachary <loic@dachary.org>
Date: Mon, 17 Oct 2016 11:40:13 +0000 (+0200)
Subject: Merge pull request #10758 from dachary/wip-17007-jewel
X-Git-Tag: v10.2.4~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54240c4d3dfeef97c6fba343fe501f0303c73f1b;p=ceph.git

Merge pull request #10758 from dachary/wip-17007-jewel

jewel: ceph-disk should timeout when a lock cannot be acquired

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

54240c4d3dfeef97c6fba343fe501f0303c73f1b