import quincy beta 17.1.0

[ceph.git] / ceph / src / include / ceph_features.h

diff --git a/ceph/src/include/ceph_features.h b/ceph/src/include/ceph_features.h
index f97440b54f50f303db1bf774498e73aeaab07d8b..ab05205c1e51df475a9b78ae33abeb1a9f0d091c 100644 (file)
--- a/ceph/src/include/ceph_features.h
+++ b/ceph/src/include/ceph_features.h
@@ -126,11 +126,12 @@ DEFINE_CEPH_FEATURE_RETIRED(28, 1, OSD_HBMSGS, HAMMER, JEWEL)
 DEFINE_CEPH_FEATURE(28, 2, SERVER_MIMIC)
 DEFINE_CEPH_FEATURE(29, 1, MDSENC)           // 4.7
 DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL)    // 3.9
-DEFINE_CEPH_FEATURE_DEPRECATED(31, 1, MON_SINGLE_PAXOS, NAUTILUS)
+DEFINE_CEPH_FEATURE_RETIRED(31, 1, MON_SINGLE_PAXOS, NAUTILUS, PACIFIC)
+// available for R
 DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS)
 DEFINE_CEPH_FEATURE(32, 3, STRETCH_MODE)
 DEFINE_CEPH_FEATURE_RETIRED(33, 1, MON_SCRUB, JEWEL, LUMINOUS)
-// available
+DEFINE_CEPH_FEATURE(33, 3, SERVER_QUINCY)
 DEFINE_CEPH_FEATURE_RETIRED(34, 1, OSD_PACKED_RECOVERY, JEWEL, LUMINOUS)
 // available
 DEFINE_CEPH_FEATURE(35, 1, OSD_CACHEPOOL)    // 3.14
@@ -213,7 +214,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATURE_OSDHASHPSPOOL |       \
         CEPH_FEATURE_NEW_OSDOP_ENCODING |        \
          CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \
-        DEPRECATED_CEPH_FEATURE_MON_SINGLE_PAXOS |    \
         CEPH_FEATURE_OSD_CACHEPOOL |       \
         CEPH_FEATURE_CRUSH_V2 |            \
         CEPH_FEATURE_EXPORT_PEER |         \
@@ -248,6 +248,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATUREMASK_OSD_REPOP_MLCOD | \
         CEPH_FEATUREMASK_SERVER_PACIFIC | \
         CEPH_FEATURE_OSD_FIXED_COLLECTION_LIST | \
+        CEPH_FEATUREMASK_SERVER_QUINCY | \
         0ULL)
 
 #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL