From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 16 Jun 2015 21:11:38 +0000 (-0700)
Subject: Merge pull request #3894 from rzarzynski/wip-rgw_swift_account_metadata
X-Git-Tag: v9.0.3~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a74e485af37df3480ea3c5706391983dcaa26c11;p=ceph.git

Merge pull request #3894 from rzarzynski/wip-rgw_swift_account_metadata

rgw: add support for metadata on Swift account

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

a74e485af37df3480ea3c5706391983dcaa26c11
diff --cc src/rgw/rgw_rest_swift.cc
index 943d7f8cfb33,f9bd512f6d53..46768affdee4
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@@ -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);