From: Orit Wasserman <owasserm@redhat.com>
Date: Sat, 4 Mar 2017 14:12:09 +0000 (+0200)
Subject: Merge pull request #13645 from yehudasa/wip-rgw-support-ragweed
X-Git-Tag: v12.0.1~183
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60bb2a8b38cb3f4afef9ad19b189c0bef63b48c0;p=ceph.git

Merge pull request #13645 from yehudasa/wip-rgw-support-ragweed

rgw: add apis to support ragweed
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---

60bb2a8b38cb3f4afef9ad19b189c0bef63b48c0
diff --cc src/rgw/rgw_common.h
index b12db936446e,112dc09903b5..53f0cbba6cd4
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@@ -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;