]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: RGWRadosGetOmapKeysCR takes result by shared_ptr 24912/head
authorCasey Bodley <cbodley@redhat.com>
Fri, 17 Aug 2018 17:15:49 +0000 (13:15 -0400)
committerNathan Cutler <ncutler@suse.com>
Sat, 3 Nov 2018 14:38:43 +0000 (15:38 +0100)
commit33ccdd6517b201e4d7e3c83a1021b042c46758bc
tree18125a233d9715a6c1ad99c40694ac904e98cb3c
parent994c4434784a665d8738efe9a0514fe2a3c409c6
rgw: RGWRadosGetOmapKeysCR takes result by shared_ptr

Fixes: http://tracker.ceph.com/issues/21154
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit fd77ff74ae47bf09553186a5a5e79ec13a9de16d)

Conflicts:
src/rgw/rgw_data_sync.cc
- in mimic, the entire "process bucket shards that previously failed"
  code block is enclosed in an if statement - in master, this is not
  the case
src/rgw/rgw_cr_rados.cc
src/rgw/rgw_cr_rados.h
src/rgw/rgw_data_sync.cc
src/rgw/rgw_sync.cc