From: Sage Weil <sage@inktank.com>
Date: Sun, 14 Jul 2013 23:12:34 +0000 (-0700)
Subject: mon: move quorum out of monmap
X-Git-Tag: v0.67-rc1~74^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf7c4022d610bf2e330c14d5bccf646bbda63fff;p=ceph.git

mon: move quorum out of monmap

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

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index c12fcb56a54b..195f66350d88 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -140,11 +140,11 @@ void MonmapMonitor::dump_info(Formatter *f)
   f->dump_unsigned("monmap_first_committed", get_first_committed());
   f->open_object_section("monmap");
   mon->monmap->dump(f);
+  f->close_section();
   f->open_array_section("quorum");
   for (set<int>::iterator q = mon->get_quorum().begin(); q != mon->get_quorum().end(); ++q)
     f->dump_int("mon", *q);
   f->close_section();
-  f->close_section();
 }
 
 bool MonmapMonitor::preprocess_command(MMonCommand *m)