From: Sage Weil <sage@redhat.com>
Date: Thu, 11 May 2017 22:28:36 +0000 (-0500)
Subject: osd/OSDMap: fix feature commit comment
X-Git-Tag: v12.0.3~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44ad0acf78c87677f34778f5f9e4ebd4b6fa2dec;p=ceph.git

osd/OSDMap: fix feature commit comment

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 1fa0f1c9cd67..446e2ca8c3f4 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1250,8 +1250,7 @@ pair<string,string> OSDMap::get_min_compat_client() const
   uint64_t f = get_features(CEPH_ENTITY_TYPE_CLIENT, nullptr);
 
   if (HAVE_FEATURE(f, OSDMAP_PG_UPMAP) ||      // v12.0.0-1733-g27d6f43
-#warning update this commit description right before or after merge
-      HAVE_FEATURE(f, CRUSH_CHOOSEARGS)) {     // FIXME
+      HAVE_FEATURE(f, CRUSH_CHOOSEARGS)) {     // v12.0.1-2172-gef1ef28
     return make_pair("luminous", "12.2.0");
   }
   if (HAVE_FEATURE(f, CRUSH_TUNABLES5)) {      // v10.0.0-612-g043a737