Merge pull request #22827 from theanalyst/wip-device-py3

author John Spray <jspray@redhat.com>

Tue, 24 Jul 2018 09:28:37 +0000 (10:28 +0100)

committer GitHub <noreply@github.com>

Tue, 24 Jul 2018 09:28:37 +0000 (10:28 +0100)
author John Spray <jspray@redhat.com>
Tue, 24 Jul 2018 09:28:37 +0000 (10:28 +0100)
committer GitHub <noreply@github.com>
Tue, 24 Jul 2018 09:28:37 +0000 (10:28 +0100)
diff --cc src/pybind/mgr/devicehealth/module.py
Simple merge
diff --cc src/pybind/mgr/restful/module.py
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 24 Jul 2018 09:28:37 +0000 (10:28 +0100)
committer	GitHub <noreply@github.com>
	Tue, 24 Jul 2018 09:28:37 +0000 (10:28 +0100)
		1	2
src/pybind/mgr/devicehealth/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/restful/module.py	patch \|	diff1 \|	diff2 \|	blob \| history