Merge pull request #25725 from cfanz/wip-mgr-handle-monmap

author Kefu Chai <tchaikov@gmail.com>

Mon, 28 Jan 2019 08:44:53 +0000 (16:44 +0800)

committer GitHub <noreply@github.com>

Mon, 28 Jan 2019 08:44:53 +0000 (16:44 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 28 Jan 2019 08:44:53 +0000 (16:44 +0800)
committer GitHub <noreply@github.com>
Mon, 28 Jan 2019 08:44:53 +0000 (16:44 +0800)
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/mgr/MgrStandby.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 28 Jan 2019 08:44:53 +0000 (16:44 +0800)
committer	GitHub <noreply@github.com>
	Mon, 28 Jan 2019 08:44:53 +0000 (16:44 +0800)
		1	2
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/MgrStandby.cc	patch \|	diff1 \|	diff2 \|	blob \| history