include/ceph_features: retire OSD_REPOP, OSD_OBJECT_DIGEST, OSD_TRANSACTION_MAY_LAYOUT

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

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