Merge pull request #21344 from yangdongsheng/lock_timeout

author Ilya Dryomov <idryomov@gmail.com>

Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)

committer GitHub <noreply@github.com>

Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)
author Ilya Dryomov <idryomov@gmail.com>
Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)
committer GitHub <noreply@github.com>
Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)
diff --cc doc/man/8/rbd.rst
Simple merge
diff --cc src/tools/rbd/action/Kernel.cc
Simple merge
author	Ilya Dryomov <idryomov@gmail.com>
	Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)
committer	GitHub <noreply@github.com>
	Thu, 19 Apr 2018 08:26:09 +0000 (10:26 +0200)
		1	2
doc/man/8/rbd.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rbd/action/Kernel.cc	patch \|	diff1 \|	diff2 \|	blob \| history