]> 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: c28876f d4ce0cc)
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)
* 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>

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