Merge pull request #22830 from ricardoasmarques/fix-24756

author Lenz Grimmer <lenz@grimmer.com>

Wed, 4 Jul 2018 11:47:42 +0000 (13:47 +0200)

committer GitHub <noreply@github.com>

Wed, 4 Jul 2018 11:47:42 +0000 (13:47 +0200)
author Lenz Grimmer <lenz@grimmer.com>
Wed, 4 Jul 2018 11:47:42 +0000 (13:47 +0200)
committer GitHub <noreply@github.com>
Wed, 4 Jul 2018 11:47:42 +0000 (13:47 +0200)
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts
Simple merge
author	Lenz Grimmer <lenz@grimmer.com>
	Wed, 4 Jul 2018 11:47:42 +0000 (13:47 +0200)
committer	GitHub <noreply@github.com>
	Wed, 4 Jul 2018 11:47:42 +0000 (13:47 +0200)