Merge pull request #34551 from tspmelo/wip-45085-nautilus

author Lenz Grimmer <lgrimmer@suse.com>

Thu, 23 Apr 2020 11:45:17 +0000 (13:45 +0200)

committer GitHub <noreply@github.com>

Thu, 23 Apr 2020 11:45:17 +0000 (13:45 +0200)
author Lenz Grimmer <lgrimmer@suse.com>
Thu, 23 Apr 2020 11:45:17 +0000 (13:45 +0200)
committer GitHub <noreply@github.com>
Thu, 23 Apr 2020 11:45:17 +0000 (13:45 +0200)
diff --cc src/pybind/mgr/dashboard/controllers/iscsi.py
Simple merge
diff --cc src/pybind/mgr/dashboard/tests/test_iscsi.py
Simple merge
author	Lenz Grimmer <lgrimmer@suse.com>
	Thu, 23 Apr 2020 11:45:17 +0000 (13:45 +0200)
committer	GitHub <noreply@github.com>
	Thu, 23 Apr 2020 11:45:17 +0000 (13:45 +0200)
		1	2
src/pybind/mgr/dashboard/controllers/iscsi.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/tests/test_iscsi.py	patch \|	diff1 \|	diff2 \|	blob \| history