include/ceph_feaetures: retire MON_NULLROUTE

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

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 3a1b95677bc9776f16dc922146048b5f78bafcd4..263e878397f27a633d81c1a647ff858d06199cca 100755 (executable)
--- 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 | \