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

jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone #15453

Merged
merged 3 commits into from Aug 25, 2017

Conversation

smithfarm
Copy link
Contributor

@smithfarm smithfarm self-assigned this Jun 3, 2017
@smithfarm smithfarm added this to the jewel milestone Jun 3, 2017
@smithfarm smithfarm changed the title jewel: [multisite] operating bucket's acl&cors is not restricted on slave zone jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone Jun 3, 2017
@smithfarm
Copy link
Contributor Author

Needs #15260 once it's merged.

@smithfarm smithfarm added rgw and removed core labels Jun 3, 2017
@smithfarm smithfarm changed the title jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone [DNM] jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone Jun 19, 2017
Guo Zhandong and others added 3 commits June 20, 2017 23:54
Fixes: http://tracker.ceph.com/issues/16888

Signed-off-by: Guo Zhandong <guozhandong@cmss.chinamobile.com>
(cherry picked from commit 5f89d37)
PutACL rejects request that include both a canned_acl and a request
body. when forwarding requests with canned_acls, we were also including
the generated policy in the body

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1c863a7)
pr#14082 is incomplete, cors should be redirect to master

Fixes: http://tracker.ceph.com/issues/16888

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit 7dd0995)

Conflicts:
	src/rgw/rgw_op.cc (jewel does not have 5fff637)
	src/test/rgw/rgw_multi/tests.py (jewel does not have this file)
@smithfarm smithfarm changed the title [DNM] jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone Jun 20, 2017
@smithfarm
Copy link
Contributor Author

@cbodley Could you look at the newest commit I just added? There were at least two obvious possibilities for resolving the conflict (that I could see). I had to pick one, but I'm not sure it's correct. The code in master was simplified by 5fff637.

Copy link
Contributor

@cbodley cbodley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm 👍

@smithfarm
Copy link
Contributor Author

Jenkins re-test this please (Unexpected die of job)

@smithfarm
Copy link
Contributor Author

This passed an rgw suite at http://tracker.ceph.com/issues/20613#note-18 and @cbodley has already approved it, so I'll merge unless there are objections.

@smithfarm smithfarm merged commit aec54d8 into ceph:jewel Aug 25, 2017
@smithfarm smithfarm deleted the wip-19768-jewel branch August 25, 2017 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants