]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge pull request #13621 from Jing-Scott/add-remov-x-delete-feature
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Mon, 3 Apr 2017 13:19:12 +0000 (15:19 +0200)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2017 13:19:12 +0000 (15:19 +0200)
commit51dd349d65b7d1180e76409945fff4d2c96ce7ea
tree3c42af97ffa3408b4e65bff87a94e7c2ba548ea3
parent13e8315d1a0d618ce9916b33c8cee50f0a2f2075
parent230429ebc4ac9b5840bb93c7e0eeb5edbb949106
Merge pull request #13621 from Jing-Scott/add-remov-x-delete-feature

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

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.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