]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5c39a5 01015f8)
Merge PR #34085 into master
authorSage Weil <sage@redhat.com>
Tue, 24 Mar 2020 20:38:04 +0000 (15:38 -0500)
committerSage Weil <sage@redhat.com>
Tue, 24 Mar 2020 20:38:04 +0000 (15:38 -0500)
* refs/pull/34085/head:
debian: add ceph-grafana-dashboards package
ceph.spec: put prometheus alerts in vendor-neutral location
mgr/cephadm: include prom alerts, if present in the container

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.