Skip to content

.gitignore: Add .pyc files globally#11076

Merged
jdurgin merged 1 commit intoceph:masterfrom
badone:wip-gitignore-pyc
Sep 15, 2016
Merged

.gitignore: Add .pyc files globally#11076
jdurgin merged 1 commit intoceph:masterfrom
badone:wip-gitignore-pyc

Conversation

@badone
Copy link
Contributor

@badone badone commented Sep 14, 2016

Signed-off-by: Brad Hubbard bhubbard@redhat.com

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
@jdurgin jdurgin merged commit 5ba2646 into ceph:master Sep 15, 2016
cbodley pushed a commit to cbodley/ceph that referenced this pull request Sep 19, 2016
Fixes: ceph#11076

Signed-off-by: Zengran Zhang <zhangzengran@h3c.com>
(cherry picked from commit 4d59b1d)

Conflicts:

	src/rgw/rgw_bucket.cc
            1. Do not use the rgw_user structure and remove the tenant parameter that describes as below
            2. user_id is not used so just remove the line
            3. instead of system_obj_set_attr you can use the method set_attr

Backport Change:
We do not use the rgw_user structure and remove the `tenant` parameter
because this feature is not introduced on hammer version.
The rgw multi-tenant feature is introduced on pr#6784 (ceph#6784)
This feature is supported from v10.0.2 and later version.
@badone badone deleted the wip-gitignore-pyc branch September 21, 2016 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants