Merge pull request #27449 from ricardoasmarques/wip-39108-nautilus

author Yuri Weinstein <yweinste@redhat.com>

Tue, 9 Apr 2019 23:49:04 +0000 (16:49 -0700)

committer GitHub <noreply@github.com>

Tue, 9 Apr 2019 23:49:04 +0000 (16:49 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Tue, 9 Apr 2019 23:49:04 +0000 (16:49 -0700)
committer GitHub <noreply@github.com>
Tue, 9 Apr 2019 23:49:04 +0000 (16:49 -0700)
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html
Simple merge
diff --cc src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Tue, 9 Apr 2019 23:49:04 +0000 (16:49 -0700)
committer	GitHub <noreply@github.com>
	Tue, 9 Apr 2019 23:49:04 +0000 (16:49 -0700)
		1	2
src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.html	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf	patch \|	diff1 \|	diff2 \|	blob \| history