From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 12 Jun 2020 21:21:40 +0000 (+0200)
Subject: Merge pull request #35475 from sebastian-philipp/octopus-backport-34879-34860-35069... 
X-Git-Tag: v15.2.4~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09150378da0e39e6c1be3ff3119e26ead43fece1;p=ceph.git

Merge pull request #35475 from sebastian-philipp/octopus-backport-34879-34860-35069-35262-35320-35322-35342-35359-35271-35375-35365-3541

octopus: cephadm batch backport June (2)

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

09150378da0e39e6c1be3ff3119e26ead43fece1