summaryrefslogtreecommitdiffstats
path: root/src/rgw/rgw_json_enc.cc
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@redhat.com>2019-11-14 05:09:53 +0100
committerYehuda Sadeh <yehuda@redhat.com>2020-01-28 19:20:38 +0100
commitd73f4f4f41c9b3640adbccfa091718e7a8f6090d (patch)
treecafc86ef826b361e1f3c0e4d37bdebf4aca14739 /src/rgw/rgw_json_enc.cc
parentrgw: sync: resolve hints when initializing policy handler (diff)
downloadceph-d73f4f4f41c9b3640adbccfa091718e7a8f6090d.tar.xz
ceph-d73f4f4f41c9b3640adbccfa091718e7a8f6090d.zip
rgw, radosgw-admin: explicit zone id type
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Diffstat (limited to 'src/rgw/rgw_json_enc.cc')
-rw-r--r--src/rgw/rgw_json_enc.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index 4a6abb6d513..54ef0baa992 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -1392,7 +1392,7 @@ void RGWZoneGroup::dump(Formatter *f) const
encode_json("sync_policy", sync_policy, f);
}
-static void decode_zones(map<string, RGWZone>& zones, JSONObj *o)
+static void decode_zones(map<rgw_zone_id, RGWZone>& zones, JSONObj *o)
{
RGWZone z;
z.decode_json(o);
@@ -2030,3 +2030,4 @@ void rgw_user::dump(Formatter *f) const
{
::encode_json("user", *this, f);
}
+