From: Kefu Chai <kchai@redhat.com>
Date: Tue, 27 Apr 2021 06:12:55 +0000 (+0800)
Subject: Merge pull request #39802 from p-se/wip-pse-cephadm-SUSE-alertmanager-octopus
X-Git-Tag: v15.2.13~10^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5407cd45bf9a5b883feebc62220a52a74bf818d1;p=ceph.git

Merge pull request #39802 from p-se/wip-pse-cephadm-SUSE-alertmanager-octopus

octopus: `cephadm ls` broken for SUSE downstream alertmanager container

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

5407cd45bf9a5b883feebc62220a52a74bf818d1