From baee1c44329cefed0274dd7090020fb533bb8205 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 Feb 2017 09:30:21 -0500 Subject: [PATCH] include/ceph_features: retire OSD_MIN_SIZE_RECOVERY, OSD_PROXY_FEATURES Signed-off-by: Sage Weil --- src/include/ceph_features.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 1befca44161f..e3f783c6ac9f 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -138,8 +138,8 @@ DEFINE_CEPH_FEATURE_RETIRED(46, 1, OSD_TRANSACTION_MAY_LAYOUT, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(47, 1, MDS_QUOTA) DEFINE_CEPH_FEATURE(48, 1, CRUSH_V4) -DEFINE_CEPH_FEATURE_DEPRECATED(49, 1, OSD_MIN_SIZE_RECOVERY, JEWEL) -DEFINE_CEPH_FEATURE_DEPRECATED(49, 1, OSD_PROXY_FEATURES, JEWEL) // overlap +DEFINE_CEPH_FEATURE_RETIRED(49, 1, OSD_MIN_SIZE_RECOVERY, JEWEL, LUMINOUS) +DEFINE_CEPH_FEATURE_RETIRED(49, 1, OSD_PROXY_FEATURES, JEWEL, LUMINOUS) // overlap DEFINE_CEPH_FEATURE(50, 1, MON_METADATA) DEFINE_CEPH_FEATURE(51, 1, OSD_BITWISE_HOBJ_SORT) @@ -206,7 +206,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_OSD_FADVISE_FLAGS | \ CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \ - DEPRECATED_CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY | \ CEPH_FEATURE_MON_METADATA | \ CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT | \ CEPH_FEATURE_ERASURE_CODE_PLUGINS_V3 | \ -- 2.47.3