]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #38333 from b-ranto/wip-prom-fixes-octopus
authorYuri Weinstein <yweinste@redhat.com>
Tue, 2 Feb 2021 16:11:27 +0000 (08:11 -0800)
committerGitHub <noreply@github.com>
Tue, 2 Feb 2021 16:11:27 +0000 (08:11 -0800)
octopus: mgr/prometheus: Sync and backport prometheus fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge