From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 4 Nov 2019 20:33:26 +0000 (-0800)
Subject: Merge pull request #31108 from k0ste/mimic_backports
X-Git-Tag: v13.2.7~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d922bcc255e21398ed21dd9c6348676c5a8de9d3;p=ceph.git

Merge pull request #31108 from k0ste/mimic_backports

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

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

d922bcc255e21398ed21dd9c6348676c5a8de9d3