Merge pull request #17385 from dillaman/wip-19957

author Nathan Cutler <presnypreklad@gmail.com>

Mon, 11 Sep 2017 21:04:09 +0000 (23:04 +0200)

committer GitHub <noreply@github.com>

Mon, 11 Sep 2017 21:04:09 +0000 (23:04 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Mon, 11 Sep 2017 21:04:09 +0000 (23:04 +0200)
committer GitHub <noreply@github.com>
Mon, 11 Sep 2017 21:04:09 +0000 (23:04 +0200)
diff --cc src/librbd/ExclusiveLock.cc
Simple merge
diff --cc src/test/librbd/test_mock_ExclusiveLock.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Mon, 11 Sep 2017 21:04:09 +0000 (23:04 +0200)
committer	GitHub <noreply@github.com>
	Mon, 11 Sep 2017 21:04:09 +0000 (23:04 +0200)
		1	2
src/librbd/ExclusiveLock.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librbd/test_mock_ExclusiveLock.cc	patch \|	diff1 \|	diff2 \|	blob \| history