Merge pull request #25680 from joscollin/wip-37634-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 30 Jan 2019 16:45:09 +0000 (08:45 -0800)

committer GitHub <noreply@github.com>

Wed, 30 Jan 2019 16:45:09 +0000 (08:45 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 30 Jan 2019 16:45:09 +0000 (08:45 -0800)
committer GitHub <noreply@github.com>
Wed, 30 Jan 2019 16:45:09 +0000 (08:45 -0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/Locker.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 30 Jan 2019 16:45:09 +0000 (08:45 -0800)
committer	GitHub <noreply@github.com>
	Wed, 30 Jan 2019 16:45:09 +0000 (08:45 -0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Locker.cc	patch \|	diff1 \|	diff2 \|	blob \| history