]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit0f8c01a1dbd0c14f20561440dd62819b1e78009a
treebede15e42588f85f59395a67723d5e7f170db63ftree | snapshot
parentb5c39a5d3f5da441e35c1b59ed513903742c0feccommit | diff
parent01015f8ca320e2eab089741e5a8871a4d78c2fc2commit | diff
Merge PR #34085 into master

* 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>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.