From: Sage Weil Date: Fri, 3 Feb 2017 14:12:33 +0000 (-0500) Subject: include/ceph_features: retire OSD_SNAPMAPPER X-Git-Tag: v12.0.1~467^2~16 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d504a3b78d4191f5ef3a1ab9dd0d3785d6d459c8;p=ceph.git include/ceph_features: retire OSD_SNAPMAPPER Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 10587252636..f3841aeb0a2 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -111,7 +111,7 @@ DEFINE_CEPH_FEATURE(28, 2, SERVER_M) DEFINE_CEPH_FEATURE(29, 1, MDSENC) DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL) DEFINE_CEPH_FEATURE(31, 1, MON_SINGLE_PAXOS) // deprecate me -DEFINE_CEPH_FEATURE_DEPRECATED(32, 1, OSD_SNAPMAPPER, JEWEL) +DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE_DEPRECATED(33, 1, MON_SCRUB, JEWEL) @@ -215,7 +215,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_NEW_OSDOP_ENCODING | \ CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \ CEPH_FEATURE_MON_SINGLE_PAXOS | \ - DEPRECATED_CEPH_FEATURE_OSD_SNAPMAPPER | \ DEPRECATED_CEPH_FEATURE_MON_SCRUB | \ DEPRECATED_CEPH_FEATURE_OSD_PACKED_RECOVERY | \ CEPH_FEATURE_OSD_CACHEPOOL | \