From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Fri, 24 Jul 2020 11:46:55 +0000 (+0300)
Subject: Merge pull request #36238 from yuvalif/fix_zippet_notif_merge
X-Git-Tag: wip-pdonnell-testing-20200918.022351~570
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4f6745cb24abaea17538379de64281037c7a4132;p=ceph-ci.git

Merge pull request #36238 from yuvalif/fix_zippet_notif_merge

rgw/notification: fix merge issues from zipper6
---

4f6745cb24abaea17538379de64281037c7a4132