summaryrefslogtreecommitdiff
path: root/src/mongo/db/mongod_options.cpp
diff options
context:
space:
mode:
authorSpencer T Brody <spencer@mongodb.com>2015-04-09 15:31:44 -0400
committerSpencer T Brody <spencer@mongodb.com>2015-04-09 17:17:15 -0400
commit26a87b0a1301f2019ece1627b31509d124d62e1a (patch)
tree6a988b0317a046e94e56e166daa51a649e1fdef1 /src/mongo/db/mongod_options.cpp
parent374438c9134e6e31322b05c8ab4c5967d97bf3eb (diff)
downloadmongo-26a87b0a1301f2019ece1627b31509d124d62e1a.tar.gz
SERVER-17965 Allow specifying both --replSet and --configsvr at the same time on mongod
Diffstat (limited to 'src/mongo/db/mongod_options.cpp')
-rw-r--r--src/mongo/db/mongod_options.cpp6
1 files changed, 0 insertions, 6 deletions
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