Merge pull request #23704 from pdvian/wip-26929-mimic

author Yuri Weinstein <yweinste@redhat.com>

Wed, 12 Sep 2018 17:12:30 +0000 (10:12 -0700)

committer GitHub <noreply@github.com>

Wed, 12 Sep 2018 17:12:30 +0000 (10:12 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 12 Sep 2018 17:12:30 +0000 (10:12 -0700)
committer GitHub <noreply@github.com>
Wed, 12 Sep 2018 17:12:30 +0000 (10:12 -0700)
diff --cc src/mds/Beacon.cc
Simple merge
diff --cc src/mds/MDSRank.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 12 Sep 2018 17:12:30 +0000 (10:12 -0700)
committer	GitHub <noreply@github.com>
	Wed, 12 Sep 2018 17:12:30 +0000 (10:12 -0700)
		1	2
src/mds/Beacon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSRank.cc	patch \|	diff1 \|	diff2 \|	blob \| history