Merge pull request #16487 from liewegas/wip-mgr-module-health

author John Spray <jspray@redhat.com>

Fri, 28 Jul 2017 12:24:41 +0000 (13:24 +0100)

committer GitHub <noreply@github.com>

Fri, 28 Jul 2017 12:24:41 +0000 (13:24 +0100)
author John Spray <jspray@redhat.com>
Fri, 28 Jul 2017 12:24:41 +0000 (13:24 +0100)
committer GitHub <noreply@github.com>
Fri, 28 Jul 2017 12:24:41 +0000 (13:24 +0100)
diff --cc src/mgr/PyModules.cc
Simple merge
diff --cc src/mgr/PyState.cc
Simple merge
diff --cc src/mon/PGMap.cc
Simple merge
author	John Spray <jspray@redhat.com>
	Fri, 28 Jul 2017 12:24:41 +0000 (13:24 +0100)
committer	GitHub <noreply@github.com>
	Fri, 28 Jul 2017 12:24:41 +0000 (13:24 +0100)
		1	2
src/mgr/PyModules.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/PyState.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history