From: Joao Eduardo Luis Date: Thu, 14 Feb 2019 15:34:07 +0000 (+0000) Subject: ceph_features: deprecate MON_SINGLE_PAXOS X-Git-Tag: v14.1.1~57^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6c097015bbc1bcfa8abe518680a3d3a17ff39884;p=ceph-ci.git ceph_features: deprecate MON_SINGLE_PAXOS Signed-off-by: Joao Eduardo Luis --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index ae52850a523..5925b897d65 100644 --- 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 | \