From: Lenz Grimmer <lgrimmer@suse.com>
Date: Tue, 22 Sep 2020 11:48:50 +0000 (+0200)
Subject: Merge pull request #36872 from callithea/wip-46972-octopus
X-Git-Tag: v15.2.9~122^2~108
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e0d456a8693152eaffffaef372298811d8ae324;p=ceph.git

Merge pull request #36872 from callithea/wip-46972-octopus

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
---

9e0d456a8693152eaffffaef372298811d8ae324