]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: Monitor: return 'required_features' on get_required_features() 3090/head
authorJoao Eduardo Luis <joao@redhat.com>
Thu, 4 Dec 2014 18:09:40 +0000 (18:09 +0000)
committerJoao Eduardo Luis <joao@redhat.com>
Fri, 16 Jan 2015 16:34:30 +0000 (16:34 +0000)
We were returning 'quorum_features' instead.  This would lead to funny
and weird behavior.  I hate funny.

Backport: emperor,firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
src/mon/Monitor.h

index 657aece3b34c3edb61750714f1334fa655461481..38db339fe6d22de8b6edf669d8db61ff3e84d3c4 100644 (file)
@@ -550,7 +550,7 @@ public:
     return quorum_features;
   }
   uint64_t get_required_features() const {
-    return quorum_features;
+    return required_features;
   }
   void apply_quorum_to_compatset_features();
   void apply_compatset_features_to_quorum_requirements();