Merge pull request #14189 from tchaikov/wip-mgr-py-stderr

author Sage Weil <sage@newdream.net>

Fri, 21 Apr 2017 23:54:01 +0000 (18:54 -0500)

committer GitHub <noreply@github.com>

Fri, 21 Apr 2017 23:54:01 +0000 (18:54 -0500)
author Sage Weil <sage@newdream.net>
Fri, 21 Apr 2017 23:54:01 +0000 (18:54 -0500)
committer GitHub <noreply@github.com>
Fri, 21 Apr 2017 23:54:01 +0000 (18:54 -0500)
diff --cc src/mgr/MgrPyModule.cc
Simple merge
diff --cc src/mgr/PyModules.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 21 Apr 2017 23:54:01 +0000 (18:54 -0500)
committer	GitHub <noreply@github.com>
	Fri, 21 Apr 2017 23:54:01 +0000 (18:54 -0500)
		1	2
src/mgr/MgrPyModule.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/PyModules.cc	patch \|	diff1 \|	diff2 \|	blob \| history