From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Jun 2019 17:59:29 +0000 (-0500)
Subject: osd/OSDMap: SERVER_OCTOPUS feature bit is now significant
X-Git-Tag: v15.1.0~2308^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc2a96638ddec2a9e1f5e16045adb71e816bc8c5;p=ceph.git

osd/OSDMap: SERVER_OCTOPUS feature bit is now significant

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

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 41f3eea54382..e4bc545e97a5 100644
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -544,7 +544,8 @@ private:
     CEPH_FEATUREMASK_CRUSH_CHOOSE_ARGS |
     CEPH_FEATUREMASK_SERVER_LUMINOUS |
     CEPH_FEATUREMASK_SERVER_MIMIC |
-    CEPH_FEATUREMASK_SERVER_NAUTILUS;
+    CEPH_FEATUREMASK_SERVER_NAUTILUS |
+    CEPH_FEATUREMASK_SERVER_OCTOPUS;
 
   struct addrs_s {
     mempool::osdmap::vector<std::shared_ptr<entity_addrvec_t> > client_addrs;