From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 24 Apr 2020 16:02:24 +0000 (+0200)
Subject: Merge pull request #34687 from sebastian-philipp/octopus-backport-34558-34216-34415... 
X-Git-Tag: v15.2.2~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fda9238b7381f6d4741f29c51255c22aa0e9e13e;p=ceph.git

Merge pull request #34687 from sebastian-philipp/octopus-backport-34558-34216-34415-34555-34556-34490-34529-34346-32951-34584-34612-34565-34568-34621

octopus: cephadm: Batch backport April (2)

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

fda9238b7381f6d4741f29c51255c22aa0e9e13e