]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge pull request #36238 from yuvalif/fix_zippet_notif_merge
authorYuval Lifshitz <yuvalif@yahoo.com>
Fri, 24 Jul 2020 11:46:55 +0000 (14:46 +0300)
committerGitHub <noreply@github.com>
Fri, 24 Jul 2020 11:46:55 +0000 (14:46 +0300)
commit4f6745cb24abaea17538379de64281037c7a4132
tree8d994dfc9d172ba0fabc196466604b203d674600
parent2731d1b3f287dd8f0ef8efbbf32580a8ca0275c4
parentd225645b846bcc243d9721dd4d31b04bff42c111
Merge pull request #36238 from yuvalif/fix_zippet_notif_merge

rgw/notification: fix merge issues from zipper6
src/rgw/rgw_op.cc