From 8ca16052138bebe9f009104e62b147750dd6584d Mon Sep 17 00:00:00 2001 From: shawn Date: Thu, 30 Jul 2015 10:09:12 +0800 Subject: [PATCH 1/2] doc: add bucket object version description. bucket object version has been supported, but do not have description in the docs, so add this part. Signed-off-by: shawn chen (cherry picked from commit 5c395ff85627f0f4154af27aff03dd0a9c409fb4) --- doc/radosgw/s3/bucketops.rst | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/radosgw/s3/bucketops.rst b/doc/radosgw/s3/bucketops.rst index f066005ab24be..95457b7565f31 100644 --- a/doc/radosgw/s3/bucketops.rst +++ b/doc/radosgw/s3/bucketops.rst @@ -345,3 +345,33 @@ Response Entities +-----------------------------------------+-------------+----------------------------------------------------------------------------------------------------------+ | ``CommonPrefixes.Prefix`` | String | The substring of the key after the prefix as defined by the ``prefix`` request parameter. | +-----------------------------------------+-------------+----------------------------------------------------------------------------------------------------------+ + +ENABLE/SUSPEND BUCKET VERSIONING +-------------------------------- + +``PUT /?versioning`` This subresource set the versioning state of an existing bucket. To set the versioning state, you must be the bucket owner. + +You can set the versioning state with one of the following values: + +- Enabled : Enables versioning for the objects in the bucket, All objects added to the bucket receive a unique version ID. +- Suspended : Disables versioning for the objects in the bucket, All objects added to the bucket receive the version ID null. + +If the versioning state has never been set on a bucket, it has no versioning state; a GET versioning request does not return a versioning state value. + +Syntax +~~~~~~ + +:: + + PUT /{bucket}?versioning HTTP/1.1 + +REQUEST ENTITIES +~~~~~~~~~~~~~~~~ + ++-----------------------------+-----------+---------------------------------------------------------------------------+ +| Name | Type | Description | ++=============================+===========+===========================================================================+ +| ``VersioningConfiguration`` | Container | A container for the request. | ++-----------------------------+-----------+---------------------------------------------------------------------------+ +| ``Status`` | String | Sets the versioning state of the bucket. Valid Values: Suspended/Enabled | ++-----------------------------+-----------+---------------------------------------------------------------------------+ \ No newline at end of file From 0d2f431b2ecad03a6cda6ffbc9f9cbaac0956af9 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Mon, 20 Jul 2015 15:37:09 +0800 Subject: [PATCH 2/2] rgw: doc: Mark S3 object version API as supported S3 object version is already in since Hammer. Ref: http://marc.info/?l=ceph-devel&m=143715290627682 Signed-off-by: Yuan Zhou (cherry picked from commit b62c3b9537e8ab33416a7fb0dd7b801a790d42ee) --- doc/radosgw/s3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/radosgw/s3.rst b/doc/radosgw/s3.rst index fe975e6b9667e..a8511d9b13d5c 100644 --- a/doc/radosgw/s3.rst +++ b/doc/radosgw/s3.rst @@ -50,7 +50,7 @@ The following table describes the support status for current Amazon S3 functiona +---------------------------------+-----------------+----------------------------------------+ | **Bucket Notification** | Not Supported | | +---------------------------------+-----------------+----------------------------------------+ -| **Bucket Object Versions** | Not Supported | | +| **Bucket Object Versions** | Supported | | +---------------------------------+-----------------+----------------------------------------+ | **Get Bucket Info (HEAD)** | Supported | | +---------------------------------+-----------------+----------------------------------------+