include/ceph_features: retire OSD_SNAPMAPPER

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 10587252636fc6012cb4070194cba1a7ec1a1d98..f3841aeb0a2ddab4a2f1ea861f40d2e40018a5e2 100755 (executable)
--- 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 |       \