Merge pull request #30912 from dillaman/wip-42265

author Mykola Golub <mgolub@suse.com>

Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)

committer GitHub <noreply@github.com>

Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)
author Mykola Golub <mgolub@suse.com>
Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)
committer GitHub <noreply@github.com>
Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)
diff --cc src/mgr/ActivePyModules.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Mykola Golub <mgolub@suse.com>
	Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)
committer	GitHub <noreply@github.com>
	Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)
		1	2
src/mgr/ActivePyModules.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history