Merge pull request #9571 from yehudasa/wip-rgw-redirect-zone

rgw: add a default redirect field for zones

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_json_enc.cc
index 059482183886b7c0a6f79dc860d510b78c2cd77a,7cb992eed03bdd6db04a70ccfc699b4b99b125b1..48690abc9da1c9d8b106b96f1022fa2627ed510b
--- 1/src/rgw/rgw_json_enc.cc
--- 2/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@@ -995,8 -987,9 +996,9 @@@ void RGWZone::decode_json(JSONObj *obj
    JSONDecoder::decode_json("bucket_index_max_shards", bucket_index_max_shards, obj);
    JSONDecoder::decode_json("read_only", read_only, obj);
    JSONDecoder::decode_json("tier_type", tier_type, obj);
 -  JSONDecoder::decode_json("sync_from_all", sync_from_all, obj);
 +  JSONDecoder::decode_json("sync_from_all", sync_from_all, true, obj);
    JSONDecoder::decode_json("sync_from", sync_from, obj);
+   JSONDecoder::decode_json("redirect_zone", redirect_zone, obj);
  }
  
  void RGWZoneGroupPlacementTarget::dump(Formatter *f) const

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/rgw/rgw_rest.cc
Simple merge

diff --cc src/test/cli/radosgw-admin/help.t
Simple merge

diff --cc src/test/rgw/rgw_multi/tests.py
Simple merge