From: Sage Weil <sage@redhat.com>
Date: Fri, 3 Feb 2017 03:19:12 +0000 (-0500)
Subject: include/ceph_features: retire MONCLOCKCHECK
X-Git-Tag: v12.0.1~467^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fcf94d571684417e98c8715ec0429d96c2982404;p=ceph.git

include/ceph_features: retire MONCLOCKCHECK

Deprecated in Jewel.

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

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 489cb4137a1e..ca746ac5e18b 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -663,7 +663,6 @@ int main(int argc, const char **argv)
   uint64_t supported =
     CEPH_FEATURE_UID |
     CEPH_FEATURE_NOSRCADDR |
-    DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK |
     CEPH_FEATURE_PGID64 |
     CEPH_FEATURE_MSG_AUTH;
   msgr->set_default_policy(Messenger::Policy::stateless_server(supported, 0));
diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index be5b52da2575..adf80db70af7 100755
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -70,7 +70,7 @@
 
 DEFINE_CEPH_FEATURE( 0, 1, UID)
 DEFINE_CEPH_FEATURE( 1, 1, NOSRCADDR)
-DEFINE_CEPH_FEATURE_DEPRECATED( 2, 1, MONCLOCKCHECK, JEWEL)
+DEFINE_CEPH_FEATURE_RETIRED( 2, 1, MONCLOCKCHECK, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE( 3, 1, FLOCK)
 DEFINE_CEPH_FEATURE( 4, 1, SUBSCRIBE2)
@@ -193,7 +193,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
 #define CEPH_FEATURES_ALL		 \
 	(CEPH_FEATURE_UID |		 \
 	 CEPH_FEATURE_NOSRCADDR |	 \
-	 DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK |	 \
 	 CEPH_FEATURE_FLOCK |		 \
 	 CEPH_FEATURE_SUBSCRIBE2 |	 \
 	 CEPH_FEATURE_MONNAMES |	 \