From: Nathan Cutler <presnypreklad@gmail.com>
Date: Fri, 7 Jul 2017 07:03:16 +0000 (+0200)
Subject: Merge pull request #14522 from smithfarm/wip-19472-kraken
X-Git-Tag: v11.2.1~75
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19280ae91e710cbb9569fc1dc3a6a24b6ea05ca4;p=ceph.git

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>
---

19280ae91e710cbb9569fc1dc3a6a24b6ea05ca4