]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3894 from rzarzynski/wip-rgw_swift_account_metadata
authorYehuda Sadeh <yehuda@redhat.com>
Tue, 16 Jun 2015 21:11:38 +0000 (14:11 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 16 Jun 2015 21:11:38 +0000 (14:11 -0700)
rgw: add support for metadata on Swift account

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/rgw/rgw_common.cc
src/rgw/rgw_common.h
src/rgw/rgw_op.cc
src/rgw/rgw_op.h
src/rgw/rgw_rest.h
src/rgw/rgw_rest_swift.cc
src/rgw/rgw_rest_swift.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 943d7f8cfb33cb822cd2fc31c3353678a5a226a2,f9bd512f6d53b08ce7dbd7ca7023d5e282acd553..46768affdee4f78a76497d0882d57dcf959bee8c
@@@ -76,9 -102,9 +106,9 @@@ void RGWListBuckets_ObjStore_SWIFT::sen
      set_req_state_err(s, ret);
    }
    /* Adding account stats in the header to keep align with Swift API */
-   dump_account_metadata(s, buckets_count, buckets_objcount, buckets_size, buckets_size_rounded);
+   dump_account_metadata(s, buckets_count, buckets_objcount, buckets_size, buckets_size_rounded, attrs);
    dump_errno(s);
 -  end_header(s, NULL);
 +  end_header(s, NULL, NULL, NO_CONTENT_LENGTH, true);
  
    if (!ret) {
      dump_start(s);
Simple merge