From: Sage Weil Date: Sat, 23 Mar 2019 07:17:03 +0000 (-0500) Subject: include/ceph_features: retire OSD_ERASURE_CODES X-Git-Tag: v15.0.0^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0ca1bace0b22ee875a1a4d12fb338583679b8e7;p=ceph.git include/ceph_features: retire OSD_ERASURE_CODES We can use this again in Q. Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 393dbb7ab72..34f988b4224 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -142,7 +142,7 @@ DEFINE_CEPH_FEATURE_RETIRED(34, 1, OSD_PACKED_RECOVERY, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(35, 1, OSD_CACHEPOOL) // 3.14 DEFINE_CEPH_FEATURE(36, 1, CRUSH_V2) // 3.14 DEFINE_CEPH_FEATURE(37, 1, EXPORT_PEER) // 3.14 -DEFINE_CEPH_FEATURE_DEPRECATED(38, 1, OSD_ERASURE_CODES, MIMIC) +DEFINE_CEPH_FEATURE_RETIRED(38, 1, OSD_ERASURE_CODES, MIMIC, OCTOPUS) DEFINE_CEPH_FEATURE(39, 1, OSDMAP_ENC) // 3.15 DEFINE_CEPH_FEATURE(40, 1, MDS_INLINE_DATA) // 3.19 DEFINE_CEPH_FEATURE(41, 1, CRUSH_TUNABLES3) // 3.15 @@ -216,7 +216,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_OSD_CACHEPOOL | \ CEPH_FEATURE_CRUSH_V2 | \ CEPH_FEATURE_EXPORT_PEER | \ - DEPRECATED_CEPH_FEATURE_OSD_ERASURE_CODES | \ CEPH_FEATURE_OSDMAP_ENC | \ CEPH_FEATURE_MDS_INLINE_DATA | \ CEPH_FEATURE_CRUSH_TUNABLES3 | \