From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Thu, 14 Nov 2019 16:45:27 +0000 (-0500)
Subject: Merge pull request #29004 from zhangsw/rgw-cleanup-taggingop
X-Git-Tag: v15.1.0~900
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=104a6a734881201d221b36f6aafe8696a5f953a8;p=ceph-ci.git

Merge pull request #29004 from zhangsw/rgw-cleanup-taggingop

rgw: remove re-defined is_tagging_op in RGWHandler_REST_Bucket_S3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

104a6a734881201d221b36f6aafe8696a5f953a8
diff --cc src/rgw/rgw_rest_s3.cc
index 0faa7d05d98,55fcffcfe7d..c0a13c54f8c
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@@ -3731,12 -3652,8 +3731,10 @@@ RGWOp *RGWHandler_REST_Bucket_S3::op_pu
      return new RGWPutLC_ObjStore_S3;
    } else if(is_policy_op()) {
      return new RGWPutBucketPolicy;
-   } else if (is_tagging_op()) {
-     return nullptr;
    } else if (is_object_lock_op()) {
      return new RGWPutBucketObjectLock_ObjStore_S3;
 +  } else if (is_notification_op()) {
 +    return RGWHandler_REST_PSNotifs_S3::create_put_op();
    }
    return new RGWCreateBucket_ObjStore_S3;
  }