From: Sage Weil Date: Tue, 16 Apr 2019 22:16:14 +0000 (-0500) Subject: mon: fix INCOMPAT_OCTOPUS feature number X-Git-Tag: v15.1.0~2885^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ac76a82d73d078fa3aa02217c56131e6d38aed9;p=ceph.git mon: fix INCOMPAT_OCTOPUS feature number It's overlapping with nautilus, which is a problem! Signed-off-by: Sage Weil --- diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index 907dbaeddc77..cf57b560a9f8 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -1046,7 +1046,7 @@ public: #define CEPH_MON_FEATURE_INCOMPAT_LUMINOUS CompatSet::Feature(9, "luminous ondisk layout") #define CEPH_MON_FEATURE_INCOMPAT_MIMIC CompatSet::Feature(10, "mimic ondisk layout") #define CEPH_MON_FEATURE_INCOMPAT_NAUTILUS CompatSet::Feature(11, "nautilus ondisk layout") -#define CEPH_MON_FEATURE_INCOMPAT_OCTOPUS CompatSet::Feature(11, "octopus ondisk layout") +#define CEPH_MON_FEATURE_INCOMPAT_OCTOPUS CompatSet::Feature(12, "octopus ondisk layout") // make sure you add your feature to Monitor::get_supported_features