Merge pull request #16699 from jcsp/wip-mgr-perf-threshold

author Kefu Chai <tchaikov@gmail.com>

Fri, 15 Sep 2017 11:48:08 +0000 (19:48 +0800)

committer GitHub <noreply@github.com>

Fri, 15 Sep 2017 11:48:08 +0000 (19:48 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 15 Sep 2017 11:48:08 +0000 (19:48 +0800)
committer GitHub <noreply@github.com>
Fri, 15 Sep 2017 11:48:08 +0000 (19:48 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/mgr/DaemonServer.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 15 Sep 2017 11:48:08 +0000 (19:48 +0800)
committer	GitHub <noreply@github.com>
	Fri, 15 Sep 2017 11:48:08 +0000 (19:48 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history