update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / doc / radosgw / s3.rst

diff --git a/ceph/doc/radosgw/s3.rst b/ceph/doc/radosgw/s3.rst
index 56c837a3cf08a2b863a4c7c1ea925b9d1a2cbe85..cf6eaba7fa4da55997919f8b8e6353348bb56f07 100644 (file)
--- a/ceph/doc/radosgw/s3.rst
+++ b/ceph/doc/radosgw/s3.rst
@@ -38,9 +38,9 @@ The following table describes the support status for current Amazon S3 functiona
 +---------------------------------+-----------------+----------------------------------------+
 | **Create Bucket**               | Supported       | Different set of canned ACLs           |
 +---------------------------------+-----------------+----------------------------------------+
-| **Bucket Lifecycle**            | Supported       | Removing expired files is supported    |
+| **Bucket Lifecycle**            | Supported       |                                        |
 +---------------------------------+-----------------+----------------------------------------+
-| **Policy (Buckets, Objects)**   | Not Supported   | ACLs are supported                     |
+| **Policy (Buckets, Objects)**   | Supported       | ACLs & bucket policies are supported   |
 +---------------------------------+-----------------+----------------------------------------+
 | **Bucket Website**              | Supported       |                                        |
 +---------------------------------+-----------------+----------------------------------------+
@@ -72,6 +72,11 @@ The following table describes the support status for current Amazon S3 functiona
 +---------------------------------+-----------------+----------------------------------------+
 | **Multipart Uploads**           | Supported       |                                        |
 +---------------------------------+-----------------+----------------------------------------+
+| **Object Tagging**              | Supported       | See :ref:`tag_policy` for Policy verbs |
++---------------------------------+-----------------+----------------------------------------+
+| **Storage Class**               | Supported       | See :ref:`storage_classes`             |
++---------------------------------+-----------------+----------------------------------------+
+
 
 Unsupported Header Fields
 -------------------------