From: Sage Weil Date: Fri, 3 Feb 2017 14:35:23 +0000 (-0500) Subject: include/ceph_features: retire CHUNKY_SCRUB X-Git-Tag: v12.0.1~467^2~19 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12dfac43028acf274e5a1c8d9b017b6cc69b5486;p=ceph.git include/ceph_features: retire CHUNKY_SCRUB Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 8501df87b4ecd..3a1b95677bc97 100755 --- 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 | \