Merge pull request #17119 from nrdmn/wip-dashboard-httproot

author Sage Weil <sage@newdream.net>

Tue, 29 Aug 2017 22:07:41 +0000 (17:07 -0500)

committer GitHub <noreply@github.com>

Tue, 29 Aug 2017 22:07:41 +0000 (17:07 -0500)
author Sage Weil <sage@newdream.net>
Tue, 29 Aug 2017 22:07:41 +0000 (17:07 -0500)
committer GitHub <noreply@github.com>
Tue, 29 Aug 2017 22:07:41 +0000 (17:07 -0500)
diff --cc src/pybind/mgr/dashboard/base.html
Simple merge
diff --cc src/pybind/mgr/dashboard/health.html
Simple merge
diff --cc src/pybind/mgr/dashboard/module.py
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 29 Aug 2017 22:07:41 +0000 (17:07 -0500)
committer	GitHub <noreply@github.com>
	Tue, 29 Aug 2017 22:07:41 +0000 (17:07 -0500)
		1	2
src/pybind/mgr/dashboard/base.html	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/health.html	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/module.py	patch \|	diff1 \|	diff2 \|	blob \| history