]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #14522 from smithfarm/wip-19472-kraken
authorNathan Cutler <presnypreklad@gmail.com>
Fri, 7 Jul 2017 07:03:16 +0000 (09:03 +0200)
committerGitHub <noreply@github.com>
Fri, 7 Jul 2017 07:03:16 +0000 (09:03 +0200)
commit19280ae91e710cbb9569fc1dc3a6a24b6ea05ca4
tree5408a440884ee15453f4da6638e7fcde852a1adc
parenteb56af6c0d8eea0e19a16da4e186e8edbfe13148
parent595c31f390fda700e6e346c208849d23c74bdf5f
Merge pull request #14522 from smithfarm/wip-19472-kraken

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

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rest_swift.cc