]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
include/ceph_features: retire QUERY_T
authorSage Weil <sage@redhat.com>
Fri, 3 Feb 2017 03:19:55 +0000 (22:19 -0500)
committerSage Weil <sage@redhat.com>
Mon, 6 Feb 2017 20:43:50 +0000 (15:43 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/include/ceph_features.h

index adf80db70af726bb08475e35511d7d62632c66f6..f70d76cd548fa8bfbaea2cb1091ec04b31abf771 100755 (executable)
@@ -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 |   \