summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorTess Avitabile <tess.avitabile@mongodb.com>2016-10-05 11:27:26 -0400
committerTess Avitabile <tess.avitabile@mongodb.com>2016-10-05 11:27:26 -0400
commitd6884f02f84f3de70897ff0534921c91a036e05e (patch)
tree924ef656cd466cc01eb5e0075cca28cd18462cbb /src/mongo
parentcbc43ba494f163611243228b0983f1b97a4d80c9 (diff)
downloadmongo-d6884f02f84f3de70897ff0534921c91a036e05e.tar.gz
Remove TODO for SERVER-26457
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/catalog/collection_options.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/collection_options.cpp b/src/mongo/db/catalog/collection_options.cpp
index 43c3e95886d..786bffad84d 100644
--- a/src/mongo/db/catalog/collection_options.cpp
+++ b/src/mongo/db/catalog/collection_options.cpp
@@ -248,8 +248,6 @@ Status CollectionOptions::parse(const BSONObj& options) {
} else if (fieldName == "writeConcern") {
continue;
} else if (fieldName == "maxTimeMS") {
- // TODO SERVER-26457: Remove in 3.6. This is needed in 3.4 because a 3.2 mongos can
- // attach maxTimeMS to a create command on the config servers.
continue;
} else {
return Status(ErrorCodes::InvalidOptions,