Merge pull request #34065 from tspmelo/wip-iscsi-advanced

author Lenz Grimmer <lgrimmer@suse.com>

Tue, 14 Apr 2020 11:31:37 +0000 (13:31 +0200)

committer GitHub <noreply@github.com>

Tue, 14 Apr 2020 11:31:37 +0000 (13:31 +0200)
author Lenz Grimmer <lgrimmer@suse.com>
Tue, 14 Apr 2020 11:31:37 +0000 (13:31 +0200)
committer GitHub <noreply@github.com>
Tue, 14 Apr 2020 11:31:37 +0000 (13:31 +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>
	Tue, 14 Apr 2020 11:31:37 +0000 (13:31 +0200)
committer	GitHub <noreply@github.com>
	Tue, 14 Apr 2020 11:31:37 +0000 (13:31 +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