ceph_features: deprecate MON_SINGLE_PAXOS

Signed-off-by: Joao Eduardo Luis <joao@suse.de>

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index ae52850a5230ba2dec7efb38325bb45d0de298cf..5925b897d65e661d6d7526312286e76f089b466a 100644 (file)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -129,7 +129,7 @@ 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(31, 1, MON_SINGLE_PAXOS)  // deprecate me
+DEFINE_CEPH_FEATURE_DEPRECATED(31, 1, MON_SINGLE_PAXOS, NAUTILUS)
 DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE_RETIRED(33, 1, MON_SCRUB, JEWEL, LUMINOUS)
@@ -209,7 +209,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATURE_OSDHASHPSPOOL |       \
         CEPH_FEATURE_NEW_OSDOP_ENCODING |        \
          CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \
-        CEPH_FEATURE_MON_SINGLE_PAXOS |    \
+        DEPRECATED_CEPH_FEATURE_MON_SINGLE_PAXOS |    \
         CEPH_FEATURE_OSD_CACHEPOOL |       \
         CEPH_FEATURE_CRUSH_V2 |            \
         CEPH_FEATURE_EXPORT_PEER |         \