Skip to content

Commit b35a8e0

Browse files
committed
rgw: fix the version in DOCODE_START() of RGWZoneGroupPlacementTier
This commit fixes an undetected merge conflict between PRs ceph#61745 and ceph#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 <[email protected]>
1 parent d3f7b54 commit b35a8e0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/rgw/rgw_zone_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ struct RGWZoneGroupPlacementTier {
626626
}
627627

628628
void decode(bufferlist::const_iterator& bl) {
629-
DECODE_START(3, bl);
629+
DECODE_START(4, bl);
630630
decode(tier_type, bl);
631631
decode(storage_class, bl);
632632
decode(retain_head_object, bl);

0 commit comments

Comments
 (0)