Merge pull request #25043 from smithfarm/wip-36460-luminous

author Yuri Weinstein <yweinste@redhat.com>

Mon, 7 Jan 2019 16:17:55 +0000 (08:17 -0800)

committer GitHub <noreply@github.com>

Mon, 7 Jan 2019 16:17:55 +0000 (08:17 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Mon, 7 Jan 2019 16:17:55 +0000 (08:17 -0800)
committer GitHub <noreply@github.com>
Mon, 7 Jan 2019 16:17:55 +0000 (08:17 -0800)
diff --cc qa/tasks/cephfs/test_misc.py
Simple merge
diff --cc src/mds/MDCache.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Mon, 7 Jan 2019 16:17:55 +0000 (08:17 -0800)
committer	GitHub <noreply@github.com>
	Mon, 7 Jan 2019 16:17:55 +0000 (08:17 -0800)
		1	2
qa/tasks/cephfs/test_misc.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	patch \|	diff1 \|	diff2 \|	blob \| history