]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57df918 70d5e21)
Merge pull request #29240 from mdw-at-linuxbox/wip-master-rgw-swift-metadata-versioning
authorJ. Eric Ivancich <ivancich@users.noreply.github.com>
Thu, 1 Aug 2019 22:28:19 +0000 (18:28 -0400)
committerGitHub <noreply@github.com>
Thu, 1 Aug 2019 22:28:19 +0000 (18:28 -0400)
rgw: Fix bucket versioning vs. swift metadata bug.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
1  2 
src/rgw/rgw_op.cc patch | diff1 | diff2 | blob | history
src/rgw/rgw_rados.h patch | diff1 | diff2 | blob | history

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