]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10758 from dachary/wip-17007-jewel
authorLoic Dachary <loic@dachary.org>
Mon, 17 Oct 2016 11:40:13 +0000 (13:40 +0200)
committerGitHub <noreply@github.com>
Mon, 17 Oct 2016 11:40:13 +0000 (13:40 +0200)
jewel: ceph-disk should timeout when a lock cannot be acquired

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

Trivial merge