summaryrefslogtreecommitdiff
path: root/src/ceph_mon.cc
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-05-18 10:38:26 -0700
committerSage Weil <sage@inktank.com>2012-05-18 16:23:58 -0700
commit1473ef43bc2662b8ad5b50e12841893bfe38cd09 (patch)
tree17bc9b106f1c99a72eed419823baba77e7a2c583 /src/ceph_mon.cc
parenta68c224ac05ba0e98a9cf2a9ee06d61154d581ac (diff)
downloadceph-1473ef43bc2662b8ad5b50e12841893bfe38cd09.tar.gz
monmap: move build_initial() from MonClient
This belongs here, not in MonClient. Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/ceph_mon.cc')
-rw-r--r--src/ceph_mon.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 6ad27c2abc7..1754e211f48 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -133,7 +133,7 @@ int main(int argc, const char **argv)
exit(1);
}
} else {
- int err = MonClient::build_initial_monmap(g_ceph_context, monmap);
+ int err = monmap.build_initial(g_ceph_context, cerr);
if (err < 0) {
cerr << argv[0] << ": warning: no initial monitors; must set 'mon initial members' and use admin socket to feed hints" << std::endl;
}
@@ -347,7 +347,7 @@ int main(int argc, const char **argv)
ipaddr = g_conf->public_addr;
} else {
MonMap tmpmap;
- int err = MonClient::build_initial_monmap(g_ceph_context, tmpmap);
+ int err = tmpmap.build_initial(g_ceph_context, cerr);
if (err < 0) {
cerr << argv[0] << ": error generating initial monmap: " << cpp_strerror(err) << std::endl;
usage();