From: Joao Eduardo Luis <joao@redhat.com>
Date: Thu, 4 Dec 2014 18:09:40 +0000 (+0000)
Subject: mon: Monitor: return 'required_features' on get_required_features()
X-Git-Tag: v0.93~270^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3090%2Fhead;p=ceph.git

mon: Monitor: return 'required_features' on get_required_features()

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>
---

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 657aece3b34c3..38db339fe6d22 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -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();