Merge pull request #21094 from guzhongyan/dne-cleanup

author Yuri Weinstein <yweinste@redhat.com>

Fri, 26 Oct 2018 19:25:04 +0000 (15:25 -0400)

committer GitHub <noreply@github.com>

Fri, 26 Oct 2018 19:25:04 +0000 (15:25 -0400)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 26 Oct 2018 19:25:04 +0000 (15:25 -0400)
committer GitHub <noreply@github.com>
Fri, 26 Oct 2018 19:25:04 +0000 (15:25 -0400)
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 26 Oct 2018 19:25:04 +0000 (15:25 -0400)
committer	GitHub <noreply@github.com>
	Fri, 26 Oct 2018 19:25:04 +0000 (15:25 -0400)
		1	2
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history