]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: Swift API. Dump container's custom metadata. 3934/head
authorDmytro Iurchenko <diurchenko@mirantis.com>
Mon, 2 Feb 2015 09:27:00 +0000 (11:27 +0200)
committerLoic Dachary <ldachary@redhat.com>
Tue, 10 Mar 2015 22:53:23 +0000 (23:53 +0100)
commit651dc556047aa4ee9e95fe9fc7bcd11488973872
tree54be9e3545b18fd54bf02205d753f2e7a23dc563
parentb5a67f0e1d15385bc0d60a6da6e7fc810bde6047
rgw: Swift API. Dump container's custom metadata.

Fixes: #10665
Backport: hammer, firefly
Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
(cherry picked from commit 2f8d31e9b1c4b09506bd1b0dad635c6e820783b2)

Conflicts:
src/rgw/rgw_rest_swift.cc
        The first hunk conflicts because X-Storage-Policy was added
after firefly. The second hunk conflicts because the type of the
s->object data member changed after firefly but it is irrelevant
because the patch does not need to access s->object anymore.
src/rgw/rgw_rest_swift.cc