diff options
author | Antonin Kral <a.kral@bobek.cz> | 2011-12-15 10:02:19 +0100 |
---|---|---|
committer | Antonin Kral <a.kral@bobek.cz> | 2011-12-15 10:02:46 +0100 |
commit | 0b48f8ada2acb0de830b23f8cefc8e3fea28d915 (patch) | |
tree | f7c2811269b6b53199412be2dd5ec02eea15d55d /db/repl.h | |
parent | 85f1cd56145b90a32b7ccdc750000deeed54fe22 (diff) | |
parent | f0d9a01bccdaeb466c12c92057914bbfef59526c (diff) | |
download | mongodb-0b48f8ada2acb0de830b23f8cefc8e3fea28d915.tar.gz |
Merge branch 'upstream/2.0.2'
Diffstat (limited to 'db/repl.h')
-rw-r--r-- | db/repl.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -122,11 +122,11 @@ namespace mongo { * @return true iff an op with the specified ns may be applied. */ bool handleDuplicateDbName( const BSONObj &op, const char *ns, const char *db ); - + public: OplogReader oplogReader; - static void applyOperation(const BSONObj& op); + void applyOperation(const BSONObj& op); string hostName; // ip addr or hostname plus optionally, ":<port>" string _sourceName; // a logical source name. string sourceName() const { return _sourceName.empty() ? "main" : _sourceName; } |