From: Adam C. Emerson Date: Tue, 24 Jan 2017 20:16:44 +0000 (-0500) Subject: Merge pull request #12445 from pritha-srivastava/wip_glob_func X-Git-Tag: v12.0.0~102 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ce40363ae3b7304ddf8ccef0a71f1a0c1a66edd;p=ceph.git Merge pull request #12445 from pritha-srivastava/wip_glob_func rgw: Added a globbing method for AWS Policies. --- 5ce40363ae3b7304ddf8ccef0a71f1a0c1a66edd diff --cc src/rgw/rgw_common.cc index b723f5422b9,676f96c1049..e80f64ecc6a --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@@ -23,9 -27,13 +27,14 @@@ #include +#define dout_context g_ceph_context #define dout_subsys ceph_subsys_rgw + #define POLICY_ACTION 0x01 + #define POLICY_RESOURCE 0x02 + #define POLICY_ARN 0x04 + #define POLICY_STRING 0x08 + PerfCounters *perfcounter = NULL; const uint32_t RGWBucketInfo::NUM_SHARDS_BLIND_BUCKET(UINT32_MAX);