From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 29 Nov 2017 08:38:54 +0000 (+0800)
Subject: Merge pull request #9571 from yehudasa/wip-rgw-redirect-zone
X-Git-Tag: v13.0.1~71
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b1378b343add5134ab881b38a93f47f3f9cb40bb;p=ceph-ci.git

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>
---

b1378b343add5134ab881b38a93f47f3f9cb40bb
diff --cc src/rgw/rgw_json_enc.cc
index 05948218388,7cb992eed03..48690abc9da
--- a/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