From: Lenz Grimmer <lgrimmer@suse.com>
Date: Thu, 9 Jul 2020 07:56:39 +0000 (+0200)
Subject: Merge pull request #35847 from callithea/wip-46171-octopus
X-Git-Tag: v15.2.5~157
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c62a4fff9eb17e40bb0c4ff4674579420342a4ea;p=ceph.git

Merge pull request #35847 from callithea/wip-46171-octopus

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
---

c62a4fff9eb17e40bb0c4ff4674579420342a4ea