Merge pull request #14375 from cbodley/wip-rgw-fetch-versioned-obj

This commit is contained in:
Yehuda Sadeh 2017-04-12 09:02:44 -07:00 committed by GitHub
commit 41f0dd1d27

View File

@ -7141,7 +7141,7 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx,
RGWPutObjProcessor_Atomic processor(obj_ctx,
dest_bucket_info, dest_obj.bucket, dest_obj.key.name,
cct->_conf->rgw_obj_stripe_size, tag, dest_bucket_info.versioning_enabled());
if (version_id) {
if (version_id && *version_id != "null") {
processor.set_version_id(*version_id);
}
processor.set_olh_epoch(olh_epoch);