From 26a87b0a1301f2019ece1627b31509d124d62e1a Mon Sep 17 00:00:00 2001
From: Spencer T Brody <spencer@mongodb.com>
Date: Thu, 9 Apr 2015 15:31:44 -0400
Subject: SERVER-17965 Allow specifying both --replSet and --configsvr at the
 same time on mongod

---
 src/mongo/db/mongod_options.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/mongo/db/mongod_options.cpp')

diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 37f6bc8e225..075d422416d 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -1142,12 +1142,6 @@ namespace mongo {
             params["sharding.clusterRole"].as<std::string>() == "configsvr") {
             serverGlobalParams.configsvr = true;
             mmapv1GlobalOptions.smallfiles = true; // config server implies small files
-            if (replSettings.usingReplSets()
-                    || replSettings.master
-                    || replSettings.slave) {
-                return Status(ErrorCodes::BadValue,
-                              "replication should not be enabled on a config server");
-            }
 
             // If we haven't explicitly specified a journal option, default journaling to true for
             // the config server role
-- 
cgit v1.2.1