]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #14659 from asheplyakov/19473-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Thu, 24 Aug 2017 08:15:57 +0000 (10:15 +0200)
committerGitHub <noreply@github.com>
Thu, 24 Aug 2017 08:15:57 +0000 (10:15 +0200)
commitb0814346f3e7553654a999b27ba12ea7985a2ff3
tree296d684aa23ecd7b6a9e1ae2b5400e8854d028c8
parentd79618b004bdb9270cbd50b98e37d69721004bce
parentcd8c51569baaccf3ea57507f427db373c415934e
Merge pull request #14659 from asheplyakov/19473-jewel

jewel: rgw: add the remove-x-delete feature to cancel swift object expiration

Reviewed-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_file.cc
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rest_swift.cc