From f27a46400e4dd1dec4c08b09eee0a6e557c07341 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 Feb 2017 09:29:16 -0500 Subject: [PATCH] include/ceph_features: retire OSD_REPOP, OSD_OBJECT_DIGEST, OSD_TRANSACTION_MAY_LAYOUT Signed-off-by: Sage Weil --- src/include/ceph_features.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index af3ca696e3e..1befca44161 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -132,9 +132,9 @@ DEFINE_CEPH_FEATURE(44, 1, ERASURE_CODE_PLUGINS_V2) DEFINE_CEPH_FEATURE_RETIRED(45, 1, OSD_SET_ALLOC_HINT, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(46, 1, OSD_FADVISE_FLAGS) -DEFINE_CEPH_FEATURE_DEPRECATED(46, 1, OSD_REPOP, JEWEL) // overlap -DEFINE_CEPH_FEATURE_DEPRECATED(46, 1, OSD_OBJECT_DIGEST, JEWEL) // overlap -DEFINE_CEPH_FEATURE_DEPRECATED(46, 1, OSD_TRANSACTION_MAY_LAYOUT, JEWEL) // overlap +DEFINE_CEPH_FEATURE_RETIRED(46, 1, OSD_REPOP, JEWEL, LUMINOUS) // overlap +DEFINE_CEPH_FEATURE_RETIRED(46, 1, OSD_OBJECT_DIGEST, JEWEL, LUMINOUS) // overlap +DEFINE_CEPH_FEATURE_RETIRED(46, 1, OSD_TRANSACTION_MAY_LAYOUT, JEWEL, LUMINOUS) // overlap DEFINE_CEPH_FEATURE(47, 1, MDS_QUOTA) DEFINE_CEPH_FEATURE(48, 1, CRUSH_V4) @@ -204,9 +204,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_OSD_POOLRESEND | \ CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 | \ CEPH_FEATURE_OSD_FADVISE_FLAGS | \ - DEPRECATED_CEPH_FEATURE_OSD_REPOP | \ - DEPRECATED_CEPH_FEATURE_OSD_OBJECT_DIGEST | \ - DEPRECATED_CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT | \ CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \ DEPRECATED_CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY | \ -- 2.39.5