From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 10 Jun 2020 16:19:18 +0000 (-0700)
Subject: Merge pull request #35436 from smithfarm/wip-45597-octopus
X-Git-Tag: v15.2.4~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19d61849558eec11145b977c6e68248fd6237e1d;p=ceph.git

Merge pull request #35436 from smithfarm/wip-45597-octopus

octopus: mgr/rbd_support: rename "rbd_trash_trash_purge_schedule" oid

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

19d61849558eec11145b977c6e68248fd6237e1d