]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix the version in DOCODE_START() of RGWZoneGroupPlacementTier 62515/head
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 26 Mar 2025 08:12:39 +0000 (08:12 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 26 Mar 2025 08:21:46 +0000 (08:21 +0000)
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 <rzarzyns@redhat.com>
src/rgw/rgw_zone_types.h

index c2695be65c7b575d65c086624945c0f61f39c9d0..d3cd73c9aa0584c2097bca509493c7a213440dca 100644 (file)
@@ -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);