]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
include/ceph_features: retire ERASURE_CODE_PLUGINS_V2
authorSage Weil <sage@redhat.com>
Sat, 23 Mar 2019 07:17:48 +0000 (02:17 -0500)
committerSage Weil <sage@redhat.com>
Tue, 2 Apr 2019 21:19:43 +0000 (16:19 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/include/ceph_features.h

index 34f988b42248e02590133f642df0f5d1bca155de..b0d9f23cff2bd8cd0f847e064edf90405102e838 100644 (file)
@@ -149,7 +149,7 @@ DEFINE_CEPH_FEATURE(41, 1, CRUSH_TUNABLES3)  // 3.15
 DEFINE_CEPH_FEATURE(41, 1, OSD_PRIMARY_AFFINITY) // overlap
 DEFINE_CEPH_FEATURE(42, 1, MSGR_KEEPALIVE2)  // 4.3 (for consistency)
 DEFINE_CEPH_FEATURE(43, 1, OSD_POOLRESEND)   // 4.13
-DEFINE_CEPH_FEATURE_DEPRECATED(44, 1, ERASURE_CODE_PLUGINS_V2, MIMIC)
+DEFINE_CEPH_FEATURE_RETIRED(44, 1, ERASURE_CODE_PLUGINS_V2, MIMIC, OCTOPUS)
 DEFINE_CEPH_FEATURE_RETIRED(45, 1, OSD_SET_ALLOC_HINT, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE(46, 1, OSD_FADVISE_FLAGS)
@@ -222,7 +222,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATURE_OSD_PRIMARY_AFFINITY |    \
         CEPH_FEATURE_MSGR_KEEPALIVE2 | \
         CEPH_FEATURE_OSD_POOLRESEND |  \
-         DEPRECATED_CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 |     \
         CEPH_FEATURE_OSD_FADVISE_FLAGS |     \
         CEPH_FEATURE_MDS_QUOTA | \
          CEPH_FEATURE_CRUSH_V4 |            \