Ceph » rgw

For what it's worth, the upstream master PR (https://github.com/ceph/ceph/pull/5109) cherry-picks cleanly onto v0.94.2 at least. Although I did have to leave out the final commit, "rgw: api adjustment following a rebase".

@Ken : I'd be interested to know why you had to loose the final commit. When I don't include it this is the error I get:

 CXX test/system/rados_list_parallel.o
In file included from rgw/rgw_json_enc.cc:5:0:
rgw/rgw_rados.h: In member function ‘librados::Rados* RGWRados::get_rados()’:

    error: rgw/rgw_rados.h:1275:41: cannot convert ‘librados::Rados**’ to ‘librados::Rados*’ in return 

librados::Rados *get_rados() { return rados; }
^

I think I get it now: this backport depends on https://github.com/ceph/ceph/pull/5612. If applied after it, the "rgw: api adjustment following a rebase" commit needs to be discarded.

If applied after it, the "rgw: api adjustment following a rebase" commit needs to be discarded.

s/after/before/

?

@Ken: what worked without discarding commits nor resolving conflicts is applying all commits on top of https://github.com/ceph/ceph/pull/5612 (that what is in https://github.com/ceph/ceph/pull/5717)