Merge pull request #34822 from votdev/wip-45324-octopus

author Lenz Grimmer <lgrimmer@suse.com>

Fri, 5 Jun 2020 14:05:26 +0000 (16:05 +0200)

committer GitHub <noreply@github.com>

Fri, 5 Jun 2020 14:05:26 +0000 (16:05 +0200)
author Lenz Grimmer <lgrimmer@suse.com>
Fri, 5 Jun 2020 14:05:26 +0000 (16:05 +0200)
committer GitHub <noreply@github.com>
Fri, 5 Jun 2020 14:05:26 +0000 (16:05 +0200)
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
Simple merge
author	Lenz Grimmer <lgrimmer@suse.com>
	Fri, 5 Jun 2020 14:05:26 +0000 (16:05 +0200)
committer	GitHub <noreply@github.com>
	Fri, 5 Jun 2020 14:05:26 +0000 (16:05 +0200)