diff options
| author | dwight <dwight@10gen.com> | 2010-08-27 16:50:53 -0400 |
|---|---|---|
| committer | dwight <dwight@10gen.com> | 2010-08-27 16:50:53 -0400 |
| commit | 7b849bd6c6f5152993647cb816525669e19ec6eb (patch) | |
| tree | 210150367ab8927b97837fed29c6fa546c5c5cdb | |
| parent | f0234a1fbb1d024a6e05615791aa0fa47c0f8ca7 (diff) | |
| parent | 8cecc5386966c8bfb239cebe3d4fd61f3dd1826f (diff) | |
| download | mongo-7b849bd6c6f5152993647cb816525669e19ec6eb.tar.gz | |
Merge branch 'master' of github.com:mongodb/mongo
| -rw-r--r-- | client/dbclient.h | 4 | ||||
| -rw-r--r-- | db/repl/rs.cpp | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/client/dbclient.h b/client/dbclient.h index 7cd2873607e..06a510c3d17 100644 --- a/client/dbclient.h +++ b/client/dbclient.h @@ -157,6 +157,10 @@ namespace mongo { static ConnectionString parse( const string& url , string& errmsg ); + string getSetName() const{ + return _setName; + } + vector<HostAndPort> getServers() const { return _servers; } diff --git a/db/repl/rs.cpp b/db/repl/rs.cpp index db62ab34d0e..83a990494ee 100644 --- a/db/repl/rs.cpp +++ b/db/repl/rs.cpp @@ -133,6 +133,7 @@ namespace mongo { void ReplSetImpl::_fillIsMaster(BSONObjBuilder& b) { const StateBox::SP sp = box.get(); bool isp = sp.state.primary(); + b.append("setName", name()); b.append("ismaster", isp); b.append("secondary", sp.state.secondary()); { |