RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-16 07:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source
This commit is contained in:
Gary Lowell 2014-01-01 07:53:37 +00:00
commit fe3fd5fb4a
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -8,7 +8,7 @@ AC_PREREQ(2.59)
# VERSION define is not used by the code. It gets a version string
# from 'git describe'; see src/ceph_ver.[ch]
AC_INIT([ceph], [0.73], [ceph-devel@vger.kernel.org])
AC_INIT([ceph], [0.74], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ceph (0.74-1) stable; urgency=low
* New upstream release
-- Gary Lowell <glowell@jenkins.front.sepia.ceph.com> Mon, 30 Dec 2013 21:02:35 +0000
ceph (0.73-1) precise; urgency=low
* New upstream release

16
src/rgw/rgw_bucket.cc
View File

@ -722,11 +722,19 @@ int RGWBucket::get_policy(RGWBucketAdminOpState& op_state, ostream& o)
std::string object_name = op_state.get_object_name();
rgw_bucket bucket = op_state.get_bucket();
bufferlist bl;
rgw_obj obj(bucket, object_name);
int ret = store->get_attr(NULL, obj, RGW_ATTR_ACL, bl);
if (ret < 0)
RGWBucketInfo bucket_info;
map<string, bufferlist> attrs;
int ret = store->get_bucket_info(NULL, bucket.name, bucket_info, NULL, &attrs);
if (ret < 0) {
return ret;
}
map<string, bufferlist>::iterator aiter = attrs.find(RGW_ATTR_ACL);
if (aiter == attrs.end()) {
return -ENOENT;
}
bufferlist& bl = aiter->second;
RGWAccessControlPolicy_S3 policy(g_ceph_context);
bufferlist::iterator iter = bl.begin();