From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 4 Jun 2020 14:55:56 +0000 (+0200)
Subject: Merge pull request #35347 from sebastian-philipp/octopus-backport-35104-35142-34902... 
X-Git-Tag: v15.2.4~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcc6234f82e89c436b6bf1c2434f78f73a2c6e08;p=ceph.git

Merge pull request #35347 from sebastian-philipp/octopus-backport-35104-35142-34902-35198-35097-35195-35266-35159-35106-35229-35194-3500

octopus: cephadm batch backport June (1)

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

dcc6234f82e89c436b6bf1c2434f78f73a2c6e08