diff options
| author | Dwight <dmerriman@gmail.com> | 2009-02-02 18:23:57 -0500 |
|---|---|---|
| committer | Dwight <dmerriman@gmail.com> | 2009-02-02 18:23:57 -0500 |
| commit | 86fa7463e92b290280f21e834b088edc303fa690 (patch) | |
| tree | 3a40636faa402bc432b558ddf0bb781ce9a1a29a /db/replset.h | |
| parent | d1ba9dfb497031952f774c7972fdeea4d2992189 (diff) | |
| parent | 84a10094d0317fce4572e2aa1adb219c7a621a70 (diff) | |
| download | mongo-86fa7463e92b290280f21e834b088edc303fa690.tar.gz | |
Merge branch 'master' of git.10gen.com:/data/gitroot/p
Conflicts:
db/instance.cpp
Diffstat (limited to 'db/replset.h')
| -rw-r--r-- | db/replset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/replset.h b/db/replset.h index c323224c974..795dbc5193c 100644 --- a/db/replset.h +++ b/db/replset.h @@ -86,7 +86,7 @@ namespace mongo { void setMaster(int n, const char *_comment = ""); /* negotiate with our peer who is master */ - void negotiate(DBClientConnection *conn); + void negotiate(DBClientConnection *conn, string method); /* peer unreachable, try our arbitrator */ void arbitrate(); |