diff options
| author | Esha Maharishi <esha.maharishi@mongodb.com> | 2016-08-10 11:33:52 -0400 |
|---|---|---|
| committer | Esha Maharishi <esha.maharishi@mongodb.com> | 2016-08-10 11:33:52 -0400 |
| commit | 82a188cc0a0b33badcc64f294908b1f629b0fb05 (patch) | |
| tree | 9e6c8bc0db1cadf503d2c8e6c070492e7728597e | |
| parent | 043b3b87e29d7891e3e8893aca13854fcd7fc5d6 (diff) | |
| download | mongo-82a188cc0a0b33badcc64f294908b1f629b0fb05.tar.gz | |
Revert "SERVER-24551 Version 3.2 incorrect 'nojournal is not allowed when configsvr is specified' error when specifying nojournal=false"
This reverts commit 67680aae26d7734e899976d020018b9cad474671.
| -rw-r--r-- | src/mongo/db/mongod_options.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp index 73ff0f85fcf..161475d567b 100644 --- a/src/mongo/db/mongod_options.cpp +++ b/src/mongo/db/mongod_options.cpp @@ -445,7 +445,8 @@ Status addMongodOptions(moe::OptionSection* options) { "declare this is a config db of a cluster; default port 27019; " "default dir /data/configdb") .setSources(moe::SourceAllLegacy) - .incompatibleWith("shardsvr"); + .incompatibleWith("shardsvr") + .incompatibleWith("nojournal"); sharding_options .addOptionChaining("shardsvr", |