Merge pull request #28246 from kungf/mgr_default_addr

author Kefu Chai <kchai@redhat.com>

Tue, 11 Jun 2019 11:48:00 +0000 (19:48 +0800)

committer GitHub <noreply@github.com>

Tue, 11 Jun 2019 11:48:00 +0000 (19:48 +0800)
author Kefu Chai <kchai@redhat.com>
Tue, 11 Jun 2019 11:48:00 +0000 (19:48 +0800)
committer GitHub <noreply@github.com>
Tue, 11 Jun 2019 11:48:00 +0000 (19:48 +0800)
diff --cc src/pybind/mgr/dashboard/module.py
Simple merge
diff --cc src/pybind/mgr/prometheus/module.py
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Tue, 11 Jun 2019 11:48:00 +0000 (19:48 +0800)
committer	GitHub <noreply@github.com>
	Tue, 11 Jun 2019 11:48:00 +0000 (19:48 +0800)
		1	2
src/pybind/mgr/dashboard/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/prometheus/module.py	patch \|	diff1 \|	diff2 \|	blob \| history