include/ceph_features: retire OSD_MIN_SIZE_RECOVERY, OSD_PROXY_FEATURES

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 1befca44161f17a52978d4dceb8f79ece5101932..e3f783c6ac9f654540e3af89c1e48481edf70357 100755 (executable)
--- 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 |   \