From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Thu, 16 Jul 2020 14:21:46 +0000 (+0200)
Subject: Merge pull request #36109 from sebastian-philipp/octopus-backport-35890-35913-35908... 
X-Git-Tag: v15.2.5~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f28b68e3f9a581948860683ccd5d459b614b86d;p=ceph.git

Merge pull request #36109 from sebastian-philipp/octopus-backport-35890-35913-35908-35927-35813-35717-35990-35915-35747-36013

octopus: cephadm batch backport July (2)

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
---

7f28b68e3f9a581948860683ccd5d459b614b86d