Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rgw: Swift API. Dump container's custom metadata. #3934

Merged
1 commit merged into from Mar 16, 2015
Merged

rgw: Swift API. Dump container's custom metadata. #3934

1 commit merged into from Mar 16, 2015

Conversation

ghost
Copy link

@ghost ghost commented Mar 10, 2015

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 2f8d31e)

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.

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 2f8d31e)

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.
@ghost ghost added bug-fix rgw labels Mar 10, 2015
@ghost ghost added this to the firefly milestone Mar 10, 2015
@ghost ghost self-assigned this Mar 10, 2015
@loic-bot
Copy link

SUCCESS: the output of run-make-check.sh on centos-7 for b0e168d is http://paste2.org/7th67kvG

:octocat: Sent from GH.

ghost pushed a commit that referenced this pull request Mar 16, 2015
rgw: Swift API. Dump container's custom metadata.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
@ghost ghost merged commit 9839726 into ceph:firefly Mar 16, 2015
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant