]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dd8c08 0d55626)
Merge pull request #39722 from p-se/wip-pse-cephadm-SUSE-alertmanager
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 2 Mar 2021 14:30:17 +0000 (15:30 +0100)
committerGitHub <noreply@github.com>
Tue, 2 Mar 2021 14:30:17 +0000 (15:30 +0100)
cephadm: `cephadm ls` broken for SUSE downstream alertmanager container

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history
src/cephadm/tests/test_cephadm.py patch | diff1 | diff2 | blob | history

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