From: Sage Weil Date: Fri, 3 Feb 2017 03:19:55 +0000 (-0500) Subject: include/ceph_features: retire QUERY_T X-Git-Tag: v12.0.1~467^2~22 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1e14c4dd331c6def297800284945cf62d051c42;p=ceph.git include/ceph_features: retire QUERY_T Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index adf80db70af7..f70d76cd548f 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 | \