From: Sage Weil <sage@redhat.com>
Date: Sun, 8 Mar 2020 21:38:28 +0000 (-0500)
Subject: Merge PR #33800 into master
X-Git-Tag: v15.1.1~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fcad77bb5f1f00481b9df692b8f38bf5c2753e4;p=ceph.git

Merge PR #33800 into master

* refs/pull/33800/head:
	mgr/cephadm: fix prom config generation when hosts have no labels or addrs

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

9fcad77bb5f1f00481b9df692b8f38bf5c2753e4