]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw/notification: fix merge issues from zipper6 36238/head
authorYuval Lifshitz <ylifshit@redhat.com>
Wed, 22 Jul 2020 09:21:20 +0000 (12:21 +0300)
committerYuval Lifshitz <ylifshit@redhat.com>
Wed, 22 Jul 2020 09:21:20 +0000 (12:21 +0300)
commitd225645b846bcc243d9721dd4d31b04bff42c111
tree95310a1195a93e0027dbf5e747af6123216d5e29
parent8b43d1afdaa605f0ce431c8773ade97a221f9af4
rgw/notification: fix merge issues from zipper6

see commit: e51d0e092dd23967c039e26ee06f1ed62eae4d11

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
src/rgw/rgw_notify.cc
src/rgw/rgw_op.cc