Merge pull request #15578 from jcsp/wip-mgr-cleanup

author Sage Weil <sage@newdream.net>

Fri, 9 Jun 2017 01:37:53 +0000 (20:37 -0500)

committer GitHub <noreply@github.com>

Fri, 9 Jun 2017 01:37:53 +0000 (20:37 -0500)
author Sage Weil <sage@newdream.net>
Fri, 9 Jun 2017 01:37:53 +0000 (20:37 -0500)
committer GitHub <noreply@github.com>
Fri, 9 Jun 2017 01:37:53 +0000 (20:37 -0500)
diff --cc src/mgr/PyModules.cc
Simple merge
diff --cc src/mgr/PyState.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 9 Jun 2017 01:37:53 +0000 (20:37 -0500)
committer	GitHub <noreply@github.com>
	Fri, 9 Jun 2017 01:37:53 +0000 (20:37 -0500)
		1	2
src/mgr/PyModules.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/PyState.cc	patch \|	diff1 \|	diff2 \|	blob \| history