From: Sage Weil Date: Fri, 3 Feb 2017 14:25:50 +0000 (-0500) Subject: include/ceph_features: retire MON_SCRUB X-Git-Tag: v12.0.1~467^2~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bf654216cc4be4b21124c7a6260ea88f72c0bda;p=ceph.git include/ceph_features: retire MON_SCRUB Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 55c60a1e207b3..224c53b5aaf3b 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -113,7 +113,7 @@ DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL) DEFINE_CEPH_FEATURE(31, 1, MON_SINGLE_PAXOS) // deprecate me DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS) -DEFINE_CEPH_FEATURE_DEPRECATED(33, 1, MON_SCRUB, JEWEL) +DEFINE_CEPH_FEATURE_RETIRED(33, 1, MON_SCRUB, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE_DEPRECATED(34, 1, OSD_PACKED_RECOVERY, JEWEL) @@ -192,7 +192,6 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_NEW_OSDOP_ENCODING | \ CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \ CEPH_FEATURE_MON_SINGLE_PAXOS | \ - DEPRECATED_CEPH_FEATURE_MON_SCRUB | \ DEPRECATED_CEPH_FEATURE_OSD_PACKED_RECOVERY | \ CEPH_FEATURE_OSD_CACHEPOOL | \ CEPH_FEATURE_CRUSH_V2 | \