include/ceph_features: retire MON_SCRUB

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

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 55c60a1e207b36ee8017451a09130e01ad8e6aaa..224c53b5aaf3b5da42f32d674349b379bee6871a 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -113,7 +113,7 @@ DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL)
 DEFINE_CEPH_FEATURE(31, 1, MON_SINGLE_PAXOS)  // deprecate me
 DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS)
 
-DEFINE_CEPH_FEATURE_DEPRECATED(33, 1, MON_SCRUB, JEWEL)
+DEFINE_CEPH_FEATURE_RETIRED(33, 1, MON_SCRUB, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE_DEPRECATED(34, 1, OSD_PACKED_RECOVERY, JEWEL)
 
@@ -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_MON_SCRUB      |           \
         DEPRECATED_CEPH_FEATURE_OSD_PACKED_RECOVERY | \
         CEPH_FEATURE_OSD_CACHEPOOL |       \
         CEPH_FEATURE_CRUSH_V2 |            \