]> 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: 5c869ed f75de91)
Merge pull request #39872 from rhcs-dashboard/wip-48190-octopus
authorYuri Weinstein <yweinste@redhat.com>
Fri, 12 Mar 2021 17:09:55 +0000 (09:09 -0800)
committerGitHub <noreply@github.com>
Fri, 12 Mar 2021 17:09:55 +0000 (09:09 -0800)
octopus: mgr/dashboard: add ssl verify option for prometheus and alert manager

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
1  2 
doc/mgr/dashboard.rst patch | diff1 | diff2 | blob | history
src/pybind/mgr/dashboard/settings.py patch | diff1 | diff2 | blob | history

diff --cc doc/mgr/dashboard.rst
Simple merge
diff --cc src/pybind/mgr/dashboard/settings.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.