]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #21344 from yangdongsheng/lock_timeout
authorIlya Dryomov <idryomov@gmail.com>
Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)
committerGitHub <noreply@github.com>
Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)
rbd: support lock_timeout in rbd mapping

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
1  2 
doc/man/8/rbd.rst
src/tools/rbd/action/Kernel.cc

Simple merge
Simple merge