include/ceph_features: retire CHUNKY_SCRUB

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

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 8501df87b4ecdec4c3fa589687428033e1e06dd0..3a1b95677bc9776f16dc922146048b5f78bafcd4 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -91,7 +91,7 @@ DEFINE_CEPH_FEATURE_RETIRED(16, 1, QUERY_T, JEWEL, LUMINOUS)
 DEFINE_CEPH_FEATURE_RETIRED(17, 1, INDEP_PG_MAP, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE(18, 1, CRUSH_TUNABLES)
-DEFINE_CEPH_FEATURE_DEPRECATED(19, 1, CHUNKY_SCRUB, JEWEL)
+DEFINE_CEPH_FEATURE_RETIRED(19, 1, CHUNKY_SCRUB, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE_DEPRECATED(20, 1, MON_NULLROUTE, JEWEL)
 
@@ -206,7 +206,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
         CEPH_FEATURE_OSDENC |           \
         CEPH_FEATURE_MONENC |           \
         CEPH_FEATURE_CRUSH_TUNABLES |   \
-        DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB | \
         DEPRECATED_CEPH_FEATURE_MON_NULLROUTE |         \
         DEPRECATED_CEPH_FEATURE_BACKFILL_RESERVATION | \
         CEPH_FEATURE_MSG_AUTH |             \