From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Mon, 3 Apr 2017 13:19:12 +0000 (+0200)
Subject: Merge pull request #13621 from Jing-Scott/add-remov-x-delete-feature
X-Git-Tag: v12.0.2~224
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51dd349d65b7d1180e76409945fff4d2c96ce7ea;p=ceph.git

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

51dd349d65b7d1180e76409945fff4d2c96ce7ea