Merge pull request #21749 from b-ranto/wip-expose-time-perfcount

author Kefu Chai <tchaikov@gmail.com>

Wed, 2 May 2018 01:59:12 +0000 (09:59 +0800)

committer GitHub <noreply@github.com>

Wed, 2 May 2018 01:59:12 +0000 (09:59 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 2 May 2018 01:59:12 +0000 (09:59 +0800)
committer GitHub <noreply@github.com>
Wed, 2 May 2018 01:59:12 +0000 (09:59 +0800)
diff --cc src/pybind/mgr/mgr_module.py
Simple merge
diff --cc src/pybind/mgr/prometheus/module.py
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 2 May 2018 01:59:12 +0000 (09:59 +0800)
committer	GitHub <noreply@github.com>
	Wed, 2 May 2018 01:59:12 +0000 (09:59 +0800)
		1	2
src/pybind/mgr/mgr_module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/prometheus/module.py	patch \|	diff1 \|	diff2 \|	blob \| history