From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 11 Jan 2021 17:39:32 +0000 (+0100)
Subject: Merge pull request #38782 from sebastian-philipp/octopus-backport-37607-38169-37696... 
X-Git-Tag: v15.2.9~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0014f6d42954430518db85f38777977c7f71ae4;p=ceph.git

Merge pull request #38782 from sebastian-philipp/octopus-backport-37607-38169-37696-37576-38211-38278-38304-38285-38317-38130-38064-3803

octopus: cephadm: batch backport January (1)

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

e0014f6d42954430518db85f38777977c7f71ae4