]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d5c758 5bd44d4)
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)
* refs/pull/33800/head:
mgr/cephadm: fix prom config generation when hosts have no labels or addrs

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.