Merge pull request #31291 from liewegas/bug-42578

author Kefu Chai <kchai@redhat.com>

Tue, 5 Nov 2019 12:17:17 +0000 (04:17 -0800)

committer GitHub <noreply@github.com>

Tue, 5 Nov 2019 12:17:17 +0000 (04:17 -0800)
author Kefu Chai <kchai@redhat.com>
Tue, 5 Nov 2019 12:17:17 +0000 (04:17 -0800)
committer GitHub <noreply@github.com>
Tue, 5 Nov 2019 12:17:17 +0000 (04:17 -0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mgr/ActivePyModules.cc
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Tue, 5 Nov 2019 12:17:17 +0000 (04:17 -0800)
committer	GitHub <noreply@github.com>
	Tue, 5 Nov 2019 12:17:17 +0000 (04:17 -0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/ActivePyModules.cc	patch \|	diff1 \|	diff2 \|	blob \| history