]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33800 into master
authorSage Weil <sage@redhat.com>
Sun, 8 Mar 2020 21:38:28 +0000 (16:38 -0500)
committerSage Weil <sage@redhat.com>
Sun, 8 Mar 2020 21:38:28 +0000 (16:38 -0500)
commit9fcad77bb5f1f00481b9df692b8f38bf5c2753e4
tree762736a3958c98ab8b293a7a03beff191a649b55
parent6d5c758117b24ee3d4bec85b0bc143bf0c1c13fa
parent5bd44d4338fe81d90744cdb39a5db110bbfcc6c2
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>