From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 4 Nov 2019 20:25:09 +0000 (-0800)
Subject: Merge pull request #31107 from k0ste/luminous_backports4
X-Git-Tag: v12.2.13~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc771926a9f40171acad68e2a3d5a53553be15f7;p=ceph.git

Merge pull request #31107 from k0ste/luminous_backports4

luminous: mgr/prometheus: Cast collect_timeout (scrape_interval) to float

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
---

dc771926a9f40171acad68e2a3d5a53553be15f7