Merge pull request #28011 from ricardoasmarques/wip-39616-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Wed, 29 May 2019 21:54:56 +0000 (14:54 -0700)

committer GitHub <noreply@github.com>

Wed, 29 May 2019 21:54:56 +0000 (14:54 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 29 May 2019 21:54:56 +0000 (14:54 -0700)
committer GitHub <noreply@github.com>
Wed, 29 May 2019 21:54:56 +0000 (14:54 -0700)
diff --cc src/pybind/mgr/dashboard/controllers/iscsi.py
Simple merge
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 29 May 2019 21:54:56 +0000 (14:54 -0700)
committer	GitHub <noreply@github.com>
	Wed, 29 May 2019 21:54:56 +0000 (14:54 -0700)
		1	2
src/pybind/mgr/dashboard/controllers/iscsi.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts	patch \|	diff1 \|	diff2 \|	blob \| history