include/ceph_features: retire OSD_PACKED_RECOVERY

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

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 224c53b5aaf3b5da42f32d674349b379bee6871a..201534307567c7dc34c55fa6659952933a30cd98 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -115,7 +115,7 @@ DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE_RETIRED(33, 1, MON_SCRUB, JEWEL, LUMINOUS)
 
-DEFINE_CEPH_FEATURE_DEPRECATED(34, 1, OSD_PACKED_RECOVERY, JEWEL)
+DEFINE_CEPH_FEATURE_RETIRED(34, 1, OSD_PACKED_RECOVERY, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE(35, 1, OSD_CACHEPOOL)
 DEFINE_CEPH_FEATURE(36, 1, CRUSH_V2)
@@ -192,7 +192,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATURE_NEW_OSDOP_ENCODING |        \
          CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \
         CEPH_FEATURE_MON_SINGLE_PAXOS |    \
-        DEPRECATED_CEPH_FEATURE_OSD_PACKED_RECOVERY | \
         CEPH_FEATURE_OSD_CACHEPOOL |       \
         CEPH_FEATURE_CRUSH_V2 |            \
         CEPH_FEATURE_EXPORT_PEER |         \