]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #36315 from p-se/fix-monitoring-images-ceph-salt
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 26 Aug 2020 11:28:00 +0000 (13:28 +0200)
committerGitHub <noreply@github.com>
Wed, 26 Aug 2020 11:28:00 +0000 (13:28 +0200)
cephadm: deploying of monitoring images partially broken

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/module.py

Simple merge
Simple merge