]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #32198 into master
authorSage Weil <sage@redhat.com>
Mon, 16 Dec 2019 16:04:13 +0000 (10:04 -0600)
committerSage Weil <sage@redhat.com>
Mon, 16 Dec 2019 16:04:13 +0000 (10:04 -0600)
commitff115188179af1a24dff43405d6ca10e441781bd
tree4ea5970b1bf63e8ab8681cc66b5d1f20ffe8e05e
parentc28876f0084d583de0550b105c2ae45222fd30e8
parentd4ce0ccacb3646ec628c238aade98d76b748a8cd
Merge PR #32198 into master

* refs/pull/32198/head:
cephadm: Fix Python2.7 isssue
cephadm: fix how uid/gid is determined
cephadm: add sample configuration for prometheus
cephadm: support deployment of prometheus

Reviewed-by: Sebastian Wagner <swagner@suse.com>