]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33804 into master
authorSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 00:57:06 +0000 (19:57 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 00:57:06 +0000 (19:57 -0500)
* refs/pull/33804/head:
cephadm: ls: warn if daemon type (version) is not supported
cephadm: report grafana version
cephadm: report prometheus, node-exporter, alertmanager versions
cephadm: use None (not '<no value>') for monitoring daemon version

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

Trivial merge