Merge pull request #25904 from pdvian/wip-37829-luminous

author Yuri Weinstein <yweinste@redhat.com>

Fri, 18 Jan 2019 20:33:13 +0000 (12:33 -0800)

committer GitHub <noreply@github.com>

Fri, 18 Jan 2019 20:33:13 +0000 (12:33 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 18 Jan 2019 20:33:13 +0000 (12:33 -0800)
committer GitHub <noreply@github.com>
Fri, 18 Jan 2019 20:33:13 +0000 (12:33 -0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/MDSMap.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 18 Jan 2019 20:33:13 +0000 (12:33 -0800)
committer	GitHub <noreply@github.com>
	Fri, 18 Jan 2019 20:33:13 +0000 (12:33 -0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSMap.h	patch \|	diff1 \|	diff2 \|	blob \| history