]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #39802 from p-se/wip-pse-cephadm-SUSE-alertmanager-octopus
authorKefu Chai <kchai@redhat.com>
Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)
committerGitHub <noreply@github.com>
Tue, 27 Apr 2021 06:12:55 +0000 (14:12 +0800)
octopus: `cephadm ls` broken for SUSE downstream alertmanager container

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/cephadm/cephadm
src/cephadm/tests/test_cephadm.py

Simple merge
Simple merge