]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #42682 into master
authorSage Weil <sage@newdream.net>
Wed, 11 Aug 2021 14:58:39 +0000 (10:58 -0400)
committerSage Weil <sage@newdream.net>
Wed, 11 Aug 2021 14:58:39 +0000 (10:58 -0400)
* refs/pull/42682/head:
cephadm: no need to explicitly enable prometheus module
mgr/cephadm: enable prometheus module before deploying prometheus
mgr/cephadm: drop daemon_id arg to CephadmService.config()
doc/cephadm: no need to manually enable the prometheus module

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>

Trivial merge