]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSDMap: fix feature commit comment 15056/head
authorSage Weil <sage@redhat.com>
Thu, 11 May 2017 22:28:36 +0000 (17:28 -0500)
committerSage Weil <sage@redhat.com>
Thu, 11 May 2017 22:29:26 +0000 (17:29 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSDMap.cc

index 1fa0f1c9cd673024b67cc35bf62df752117b39f3..446e2ca8c3f4425709f29db837cf87e15ba64080 100644 (file)
@@ -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