From b35a8e00b2599664444a61acfb13054064531bf8 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 26 Mar 2025 08:12:39 +0000 Subject: [PATCH] rgw: fix the version in DOCODE_START() of RGWZoneGroupPlacementTier This commit fixes an undetected merge conflict between PRs #61745 and #60159. The dencoding problem has been introduced very recently, it is straightforward and causes failures of the make check bot everywhere, therefore -- if no objections -- I want to merge this patch without the Teuthology testing. Signed-off-by: Radoslaw Zarzynski --- src/rgw/rgw_zone_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_zone_types.h b/src/rgw/rgw_zone_types.h index c2695be65c7b5..d3cd73c9aa058 100644 --- a/src/rgw/rgw_zone_types.h +++ b/src/rgw/rgw_zone_types.h @@ -626,7 +626,7 @@ struct RGWZoneGroupPlacementTier { } void decode(bufferlist::const_iterator& bl) { - DECODE_START(3, bl); + DECODE_START(4, bl); decode(tier_type, bl); decode(storage_class, bl); decode(retain_head_object, bl); -- 2.39.5