From d1e14c4dd331c6def297800284945cf62d051c42 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 2 Feb 2017 22:19:55 -0500 Subject: [PATCH] include/ceph_features: retire QUERY_T Signed-off-by: Sage Weil --- src/include/ceph_features.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index adf80db70af..f70d76cd548 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -86,7 +86,7 @@ DEFINE_CEPH_FEATURE(13, 1, OSDENC) DEFINE_CEPH_FEATURE_RETIRED(14, 1, OMAP, HAMMER, JEWEL) DEFINE_CEPH_FEATURE(14, 2, SERVER_KRAKEN) DEFINE_CEPH_FEATURE(15, 1, MONENC) -DEFINE_CEPH_FEATURE_DEPRECATED(16, 1, QUERY_T, JEWEL) +DEFINE_CEPH_FEATURE_RETIRED(16, 1, QUERY_T, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE_DEPRECATED(17, 1, INDEP_PG_MAP, JEWEL) @@ -204,7 +204,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_PGPOOL3 | \ CEPH_FEATURE_OSDREPLYMUX | \ CEPH_FEATURE_OSDENC | \ - DEPRECATED_CEPH_FEATURE_QUERY_T | \ CEPH_FEATURE_MONENC | \ DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP | \ CEPH_FEATURE_CRUSH_TUNABLES | \ -- 2.39.5