From: Sage Weil Date: Fri, 3 Feb 2017 14:35:26 +0000 (-0500) Subject: include/ceph_feaetures: retire MON_NULLROUTE X-Git-Tag: v12.0.1~467^2~18 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c84d9c83ed4d4dbbf948be92c16d62bde288483d;p=ceph.git include/ceph_feaetures: retire MON_NULLROUTE Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 3a1b95677bc9..263e878397f2 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -93,7 +93,7 @@ DEFINE_CEPH_FEATURE_RETIRED(17, 1, INDEP_PG_MAP, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(18, 1, CRUSH_TUNABLES) DEFINE_CEPH_FEATURE_RETIRED(19, 1, CHUNKY_SCRUB, JEWEL, LUMINOUS) -DEFINE_CEPH_FEATURE_DEPRECATED(20, 1, MON_NULLROUTE, JEWEL) +DEFINE_CEPH_FEATURE_RETIRED(20, 1, MON_NULLROUTE, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE_RETIRED(21, 1, MON_GV, HAMMER, JEWEL) DEFINE_CEPH_FEATURE(21, 2, SERVER_LUMINOUS) @@ -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_MON_NULLROUTE | \ DEPRECATED_CEPH_FEATURE_BACKFILL_RESERVATION | \ CEPH_FEATURE_MSG_AUTH | \ DEPRECATED_CEPH_FEATURE_RECOVERY_RESERVATION | \