From eb9efb78c7e94de6a6b0d3f6b131335e10922bc4 Mon Sep 17 00:00:00 2001
From: Eliot Horowitz <eliot@10gen.com>
Date: Thu, 1 Jul 2010 10:22:40 -0400
Subject: masterConn in DBClientPaired

Conflicts:

	client/dbclient.h
---
 client/dbclient.cpp | 4 ++++
 client/dbclient.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/client/dbclient.cpp b/client/dbclient.cpp
index f617f7cbbbb..109a19bee2b 100644
--- a/client/dbclient.cpp
+++ b/client/dbclient.cpp
@@ -932,6 +932,10 @@ namespace mongo {
         return master == Left ? left : right;
     }
 
+    DBClientConnection& DBClientPaired::masterConn(){
+        return checkMaster();
+    }
+
     DBClientConnection& DBClientPaired::slaveConn(){
         DBClientConnection& m = checkMaster();
         assert( ! m.isFailed() );
diff --git a/client/dbclient.h b/client/dbclient.h
index a2fad8e260d..c01465026a5 100644
--- a/client/dbclient.h
+++ b/client/dbclient.h
@@ -909,6 +909,7 @@ namespace mongo {
             return left.getServerAddress() + "," + right.getServerAddress();
         }
 
+        DBClientConnection& masterConn();
         DBClientConnection& slaveConn();
 
         /* TODO - not yet implemented. mongos may need these. */
-- 
cgit v1.2.1