summaryrefslogtreecommitdiffstats
path: root/src/mon/MonmapMonitor.cc
diff options
context:
space:
mode:
authorJoao Eduardo Luis <joao@suse.de>2016-02-01 18:27:43 +0100
committerJoao Eduardo Luis <joao@suse.de>2016-10-29 05:10:23 +0200
commit5a42eda59da4377dbba3eb93eed0439240e2fbdf (patch)
tree71174ff4cba55f7d73d812614c46d91ff07c3ae5 /src/mon/MonmapMonitor.cc
parentmon: Elector: support mon-specific features (diff)
downloadceph-5a42eda59da4377dbba3eb93eed0439240e2fbdf.tar.xz
ceph-5a42eda59da4377dbba3eb93eed0439240e2fbdf.zip
mon: rename quorum_features to quorum_con_features
Because now we have quorum_mon_features too. Signed-off-by: Joao Eduardo Luis <joao@suse.de>
Diffstat (limited to 'src/mon/MonmapMonitor.cc')
-rw-r--r--src/mon/MonmapMonitor.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index a36679e4062..1b84c327abb 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -89,7 +89,7 @@ void MonmapMonitor::encode_pending(MonitorDBStore::TransactionRef t)
assert(mon->monmap->epoch + 1 == pending_map.epoch ||
pending_map.epoch == 1); // special case mkfs!
bufferlist bl;
- pending_map.encode(bl, mon->get_quorum_features());
+ pending_map.encode(bl, mon->get_quorum_con_features());
put_version(t, pending_map.epoch, bl);
put_last_committed(t, pending_map.epoch);