]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: add minssing admin property when sync user info. 30804/head
authorzhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 4 Sep 2019 06:46:13 +0000 (14:46 +0800)
committerNathan Cutler <ncutler@suse.com>
Wed, 9 Oct 2019 09:38:53 +0000 (11:38 +0200)
commitbb2e9473bec56c87c75275f4b8694e0336a4ed7f
tree66366a937ce0a12b6ac3af97cfb49ad924a78312
parent44388c00096cf434bb93733e02ee3e74ec47af8e
rgw: add minssing admin property when sync user info.

Fixes: https://tracker.ceph.com/issues/41643
Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit 9ad975d422aba67c0bf7bc1b114079331e2f7fd5)

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 d2c02b37e3a7 which is not being backported
src/rgw/rgw_json_enc.cc