diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2011-06-18 21:24:54 +0200 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2011-06-18 21:24:54 +0200 |
| commit | fefb1e355f6cbe35160f2f73ed68a38d95fa59a2 (patch) | |
| tree | faecb2fb6677516c5f6d9edfae8475344ddd73ed /db/repl/rs.cpp | |
| parent | d95b46b2bbb5b4246213f252010508489b4e5719 (diff) | |
| parent | 64b33ee522375a8dc15be2875dfb7db4502259b0 (diff) | |
| download | mongodb-fefb1e355f6cbe35160f2f73ed68a38d95fa59a2.tar.gz | |
Merge commit 'upstream/1.8.2'
Diffstat (limited to 'db/repl/rs.cpp')
| -rw-r--r-- | db/repl/rs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/repl/rs.cpp b/db/repl/rs.cpp index 90ed9f4..bbfb057 100644 --- a/db/repl/rs.cpp +++ b/db/repl/rs.cpp @@ -321,7 +321,7 @@ namespace mongo { } ReplSetImpl::StartupStatus ReplSetImpl::startupStatus = PRESTART; - string ReplSetImpl::startupStatusMsg; + DiagStr ReplSetImpl::startupStatusMsg; extern BSONObj *getLastErrorDefault; |