mimic: rgw: add missing admin property when sync user info #30804
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes: https://tracker.ceph.com/issues/41643 Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com> (cherry picked from commit 9ad975d) Conflicts: src/rgw/rgw_json_enc.cc - trivial resolution src/rgw/rgw_user.cc - modification to "static void dump_user_info()" dropped because it changes code that was added by d2c02b3 which is not being backported
smithfarm
changed the title
|
@cbodley Calling your attention to the conflict message: Should I cherry-pick d2c02b3 first, instead of dropping the change to |
|
@cbodley Bump my question above |
yuriw
added
wip-yuri5-testing
wip-yuri3-testing
and removed
wip-yuri5-testing
wip-yuri3-testing
labels
cbodley
approved these changes
Feb 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/41975
backport of #30127
parent tracker: https://tracker.ceph.com/issues/41643
this backport was staged using ceph-backport.sh version 15.0.0.5775
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh