]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #29004 from zhangsw/rgw-cleanup-taggingop
authorCasey Bodley <cbodley@users.noreply.github.com>
Thu, 14 Nov 2019 16:45:27 +0000 (11:45 -0500)
committerGitHub <noreply@github.com>
Thu, 14 Nov 2019 16:45:27 +0000 (11:45 -0500)
rgw: remove re-defined is_tagging_op in RGWHandler_REST_Bucket_S3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h

index 0faa7d05d988718d4c04ae26f0858bfc1e4dee20,55fcffcfe7deae6aec2386e6207ec76dd69a614a..c0a13c54f8c7f4c8cc2c9b99dc4bd09f80e23d6c
@@@ -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;
  }
Simple merge