summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordwight <dwight@dwights-MacBook-Pro.local>2010-07-30 10:45:57 -0400
committerdwight <dwight@dwights-MacBook-Pro.local>2010-07-30 10:45:57 -0400
commit5774d1e79bafbc8220639e358756eb5c70d30126 (patch)
tree5fc2540cad34f0885043c95816d99e9e4a572891
parent4c7452ee14979a1209440287d473df136eb9883d (diff)
parent96d7b5a19e8657725b89ce63a516274d22e6b165 (diff)
downloadmongo-5774d1e79bafbc8220639e358756eb5c70d30126.tar.gz
Merge branch 'master' of git@github.com:mongodb/mongo
-rw-r--r--db/repl/replset_commands.cpp2
-rw-r--r--shell/servers.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/repl/replset_commands.cpp b/db/repl/replset_commands.cpp
index 538748867a6..e10568b3550 100644
--- a/db/repl/replset_commands.cpp
+++ b/db/repl/replset_commands.cpp
@@ -73,7 +73,7 @@ namespace mongo {
int getRBID(DBClientConnection *c) {
bo info;
c->simpleCommand("admin", &info, "replSetGetRBID");
- return info["rbid"].Number();
+ return info["rbid"].numberInt();
}
class CmdReplSetGetStatus : public ReplSetCommand {
diff --git a/shell/servers.js b/shell/servers.js
index 2f8faa1c744..e6e03551bf6 100644
--- a/shell/servers.js
+++ b/shell/servers.js
@@ -884,7 +884,7 @@ ReplSetTest = function( opts ){
this.initBridges();
}
else {
- this.ports = allocatePorts( this.numNodes , startPort );
+ this.ports = allocatePorts( this.numNodes , this.startPort );
}
this.nodes = [];