Merge pull request #22550 from smithfarm/wip-24296-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 11 Jul 2018 23:25:45 +0000 (16:25 -0700)

committer GitHub <noreply@github.com>

Wed, 11 Jul 2018 23:25:45 +0000 (16:25 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 11 Jul 2018 23:25:45 +0000 (16:25 -0700)
committer GitHub <noreply@github.com>
Wed, 11 Jul 2018 23:25:45 +0000 (16:25 -0700)
diff --cc src/mds/MDSDaemon.h
Simple merge
diff --cc src/mds/Migrator.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 11 Jul 2018 23:25:45 +0000 (16:25 -0700)
committer	GitHub <noreply@github.com>
	Wed, 11 Jul 2018 23:25:45 +0000 (16:25 -0700)
		1	2
src/mds/MDSDaemon.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Migrator.cc	patch \|	diff1 \|	diff2 \|	blob \| history