Merge pull request #27090 from xiexingguo/wip-config-mon-core

author Xie Xingguo <xie.xingguo@zte.com.cn>

Mon, 25 Mar 2019 05:28:41 +0000 (13:28 +0800)

committer GitHub <noreply@github.com>

Mon, 25 Mar 2019 05:28:41 +0000 (13:28 +0800)
author Xie Xingguo <xie.xingguo@zte.com.cn>
Mon, 25 Mar 2019 05:28:41 +0000 (13:28 +0800)
committer GitHub <noreply@github.com>
Mon, 25 Mar 2019 05:28:41 +0000 (13:28 +0800)
diff --cc qa/workunits/mon/config.sh
Simple merge
diff --cc src/mon/ConfigMonitor.cc
Simple merge
author	Xie Xingguo <xie.xingguo@zte.com.cn>
	Mon, 25 Mar 2019 05:28:41 +0000 (13:28 +0800)
committer	GitHub <noreply@github.com>
	Mon, 25 Mar 2019 05:28:41 +0000 (13:28 +0800)
		1	2
qa/workunits/mon/config.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/ConfigMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history