Merge branch 'master' into s2_pubsub_api_new

diff --cc doc/radosgw/s3.rst
index f391830896b49cc7baff5a0d5caccb432fce1aff,d1d4b6b53193e9cd6311a5d1d2867abb1087543a..bf4b0577f58874e952601fb5f6cbb200a9b884a1
--- 1/doc/radosgw/s3.rst
--- 2/doc/radosgw/s3.rst
+++ b/doc/radosgw/s3.rst
@@@ -29,55 -29,57 +29,56 @@@ Features Suppor
  
  The following table describes the support status for current Amazon S3 functional features:
  
- +---------------------------------+-----------------+------------------------------------------+
- | Feature                         | Status          | Remarks                                  |
- +=================================+=================+==========================================+
- | **List Buckets**                | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Delete Bucket**               | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Create Bucket**               | Supported       | Different set of canned ACLs             |
- +---------------------------------+-----------------+------------------------------------------+
- | **Bucket Lifecycle**            | Supported       | Removing expired files is supported      |
- +---------------------------------+-----------------+------------------------------------------+
- | **Policy (Buckets, Objects)**   | Supported       | ACLs & bucket policies are supported     |
- +---------------------------------+-----------------+------------------------------------------+
- | **Bucket Website**              | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Bucket ACLs (Get, Put)**      | Supported       | Different set of canned ACLs             |
- +---------------------------------+-----------------+------------------------------------------+
- | **Bucket Location**             | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Bucket Notification**         | Supported       | See `S3 Notification Compatibility`_     |
- +---------------------------------+-----------------+------------------------------------------+
- | **Bucket Object Versions**      | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Get Bucket Info (HEAD)**      | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Bucket Request Payment**      | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Put Object**                  | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Delete Object**               | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Get Object**                  | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Object ACLs (Get, Put)**      | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Get Object Info (HEAD)**      | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **POST Object**                 | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Copy Object**                 | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Multipart Uploads**           | Supported       |                                          |
- +---------------------------------+-----------------+------------------------------------------+
- | **Object Tagging**              | Supported       | See :ref:`tag_policy` for Policy verbs   |
- +---------------------------------+-----------------+------------------------------------------+
- | **Storage Class**               | Not Supported   | Use **Bucket Location** as alternative   |
- +----------------------------------------------------------------------------------------------+
- 
+ +---------------------------------+-----------------+----------------------------------------+
+ | Feature                         | Status          | Remarks                                |
+ +=================================+=================+========================================+
+ | **List Buckets**                | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Delete Bucket**               | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Create Bucket**               | Supported       | Different set of canned ACLs           |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Bucket Lifecycle**            | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Policy (Buckets, Objects)**   | Supported       | ACLs & bucket policies are supported   |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Bucket Website**              | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Bucket ACLs (Get, Put)**      | Supported       | Different set of canned ACLs           |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Bucket Location**             | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
 -| **Bucket Notification**         | Not Supported   |                                        |
++| **Bucket Notification**         | Supported       | See `S3 Notification Compatibility`_   |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Bucket Object Versions**      | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Get Bucket Info (HEAD)**      | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Bucket Request Payment**      | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Put Object**                  | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Delete Object**               | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Get Object**                  | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Object ACLs (Get, Put)**      | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Get Object Info (HEAD)**      | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **POST Object**                 | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Copy Object**                 | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Multipart Uploads**           | Supported       |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Object Tagging**              | Supported       | See :ref:`tag_policy` for Policy verbs |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Bucket Tagging**              | Not Supported   |                                        |
+ +---------------------------------+-----------------+----------------------------------------+
+ | **Storage Class**               | Supported       | See :ref:`storage_classes`             |
+ +---------------------------------+-----------------+----------------------------------------+
  
 -
  Unsupported Header Fields
  -------------------------
  

diff --cc src/rgw/CMakeLists.txt
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_common.cc
Simple merge

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_rest.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge

diff --cc src/rgw/rgw_rest_sts.cc
Simple merge

diff --cc src/test/rgw/CMakeLists.txt
Simple merge