From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 19 Apr 2018 08:26:09 +0000 (+0200)
Subject: Merge pull request #21344 from yangdongsheng/lock_timeout
X-Git-Tag: v13.1.0~196
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d0ccfb4026bf34c9cbbb8b8c65a3bddaca6fc982;p=ceph-ci.git

Merge pull request #21344 from yangdongsheng/lock_timeout

rbd: support lock_timeout in rbd mapping

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
---

d0ccfb4026bf34c9cbbb8b8c65a3bddaca6fc982