From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 2 Jul 2020 09:26:52 +0000 (+0200)
Subject: Merge pull request #35568 from sebastian-philipp/octopus-backport-34633-35099-35459... 
X-Git-Tag: v15.2.5~173
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cb3d096b30176d88b673f1a1532b2c265ec9a46;p=ceph.git

Merge pull request #35568 from sebastian-philipp/octopus-backport-34633-35099-35459-35521-35504-35474-35538

octopus: cephadm batch backport June (3)

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
---

9cb3d096b30176d88b673f1a1532b2c265ec9a46