From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 10 Aug 2020 01:53:45 +0000 (+0200)
Subject: Merge pull request #36450 from sebastian-philipp/octopus-backport-35374-35667-36225... 
X-Git-Tag: v15.2.5~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96411838ef6fef9a5285ca4d5c0708e6a599632e;p=ceph.git

Merge pull request #36450 from sebastian-philipp/octopus-backport-35374-35667-36225-35839-36239-36301-36262-36012-36285-36235-36217-3572

octopus: cephadm batch backport August (1)

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

96411838ef6fef9a5285ca4d5c0708e6a599632e