From: Sage Weil Date: Fri, 3 Feb 2017 03:20:25 +0000 (-0500) Subject: include/ceph_features: return INDEP_PG_MAP X-Git-Tag: v12.0.1~467^2~21 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5feb249793383b4d3520e15ef7a278f1e6094e2;p=ceph.git include/ceph_features: return INDEP_PG_MAP Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index f70d76cd548..8501df87b4e 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -88,7 +88,7 @@ DEFINE_CEPH_FEATURE(14, 2, SERVER_KRAKEN) DEFINE_CEPH_FEATURE(15, 1, MONENC) DEFINE_CEPH_FEATURE_RETIRED(16, 1, QUERY_T, JEWEL, LUMINOUS) -DEFINE_CEPH_FEATURE_DEPRECATED(17, 1, INDEP_PG_MAP, JEWEL) +DEFINE_CEPH_FEATURE_RETIRED(17, 1, INDEP_PG_MAP, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(18, 1, CRUSH_TUNABLES) DEFINE_CEPH_FEATURE_DEPRECATED(19, 1, CHUNKY_SCRUB, JEWEL) @@ -205,7 +205,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_OSDREPLYMUX | \ CEPH_FEATURE_OSDENC | \ CEPH_FEATURE_MONENC | \ - DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP | \ CEPH_FEATURE_CRUSH_TUNABLES | \ DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB | \ DEPRECATED_CEPH_FEATURE_MON_NULLROUTE | \