]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #13645 from yehudasa/wip-rgw-support-ragweed
authorOrit Wasserman <owasserm@redhat.com>
Sat, 4 Mar 2017 14:12:09 +0000 (16:12 +0200)
committerGitHub <noreply@github.com>
Sat, 4 Mar 2017 14:12:09 +0000 (16:12 +0200)
rgw: add apis to support ragweed
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1  2 
src/rgw/rgw_common.h
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h

index b12db936446ef3d3f25dc98de9cfda028470a193,112dc09903b506802cb1b27d58b16f4edd5920e8..53f0cbba6cd497d7cbbf149471e844c60e8387c4
@@@ -446,18 -444,10 +446,19 @@@ enum RGWOpType 
    RGW_OP_GET_CROSS_DOMAIN_POLICY,
    RGW_OP_GET_HEALTH_CHECK,
    RGW_OP_GET_INFO,
 +  RGW_OP_CREATE_ROLE,
 +  RGW_OP_DELETE_ROLE,
 +  RGW_OP_GET_ROLE,
 +  RGW_OP_MODIFY_ROLE,
 +  RGW_OP_LIST_ROLES,
 +  RGW_OP_PUT_ROLE_POLICY,
 +  RGW_OP_GET_ROLE_POLICY,
 +  RGW_OP_LIST_ROLE_POLICIES,
 +  RGW_OP_DELETE_ROLE_POLICY,
  
    /* rgw specific */
-   RGW_OP_ADMIN_SET_METADATA
+   RGW_OP_ADMIN_SET_METADATA,
+   RGW_OP_GET_OBJ_LAYOUT,
  };
  
  class RGWAccessControlPolicy;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge