Merge pull request #31782 from rhcs-dashboard/wip-42809-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 15 Jan 2020 16:41:01 +0000 (08:41 -0800)

committer GitHub <noreply@github.com>

Wed, 15 Jan 2020 16:41:01 +0000 (08:41 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 15 Jan 2020 16:41:01 +0000 (08:41 -0800)
committer GitHub <noreply@github.com>
Wed, 15 Jan 2020 16:41:01 +0000 (08:41 -0800)
diff --cc src/mgr/BaseMgrModule.cc
Simple merge
diff --cc src/pybind/mgr/mgr_module.py
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 15 Jan 2020 16:41:01 +0000 (08:41 -0800)
committer	GitHub <noreply@github.com>
	Wed, 15 Jan 2020 16:41:01 +0000 (08:41 -0800)
		1	2
src/mgr/BaseMgrModule.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/mgr_module.py	patch \|	diff1 \|	diff2 \|	blob \| history