From: Abhishek L <abhishek@suse.com>
Date: Thu, 19 Sep 2019 17:41:00 +0000 (+0200)
Subject: Merge pull request #29680 from liuchang0812/s3-lock-bugfix
X-Git-Tag: v15.1.0~1501
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89945b1bf317c79e2fd1563a66105223f9a657c8;p=ceph.git

Merge pull request #29680 from liuchang0812/s3-lock-bugfix

rgw: DefaultRetention requires either Days or Years

Reviewed-By: Casey Bodley <cbodley@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
---

89945b1bf317c79e2fd1563a66105223f9a657c8