From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 2 Jun 2020 11:39:45 +0000 (+0200)
Subject: Merge pull request #35188 from sebastian-philipp/octopus-backport-34745-34658-34814... 
X-Git-Tag: v15.2.4~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c168a115c68feecc48da95113cc2fcb6bd85cd7f;p=ceph.git

Merge pull request #35188 from sebastian-philipp/octopus-backport-34745-34658-34814-34778-34703-34773-34856-34898-34887-34820-34891-3490

octopus: Batch backport May (2)

Reviewed-by: Tim Serong <tserong@suse.com>
---

c168a115c68feecc48da95113cc2fcb6bd85cd7f