Merge pull request #23362 from luhp/master

author Kefu Chai <tchaikov@gmail.com>

Mon, 17 Dec 2018 12:00:33 +0000 (20:00 +0800)

committer GitHub <noreply@github.com>

Mon, 17 Dec 2018 12:00:33 +0000 (20:00 +0800)
author Kefu Chai <tchaikov@gmail.com>
Mon, 17 Dec 2018 12:00:33 +0000 (20:00 +0800)
committer GitHub <noreply@github.com>
Mon, 17 Dec 2018 12:00:33 +0000 (20:00 +0800)
diff --cc src/common/perf_counters.h
Simple merge
diff --cc src/test/perf_counters.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Mon, 17 Dec 2018 12:00:33 +0000 (20:00 +0800)
committer	GitHub <noreply@github.com>
	Mon, 17 Dec 2018 12:00:33 +0000 (20:00 +0800)
		1	2
src/common/perf_counters.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/perf_counters.cc	patch \|	diff1 \|	diff2 \|	blob \| history