]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2731d1b d225645)
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)
rgw/notification: fix merge issues from zipper6

1  2 
src/rgw/rgw_op.cc patch | diff1 | diff2 | blob | history

diff --cc src/rgw/rgw_op.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.