summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2016-10-12 17:01:17 -0400
committerRandolph Tan <randolph@10gen.com>2016-10-17 13:31:43 -0400
commit26cb6b14f4a2ab445293e3503f53e32c19e0dd53 (patch)
treee6bd6096e849adadbde4b126578b43b790485c24 /src
parentb11e97b8a85e2f3c2c29430884bb5d93bfc8da52 (diff)
downloadmongo-26cb6b14f4a2ab445293e3503f53e32c19e0dd53.tar.gz
SERVER-26610 add maxTimeMS to setFeatureCompatibilityVersion call in set_feature_compatibility_version.js
Diffstat (limited to 'src')
-rw-r--r--src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp b/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp
index d8b47d12b17..e8d2761993a 100644
--- a/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp
+++ b/src/mongo/s/commands/cluster_set_feature_compatibility_version_cmd.cpp
@@ -103,6 +103,8 @@ public:
<< ". See http://dochub.mongodb.org/core/3.4-feature-compatibility.",
elem.type() == BSONType::String);
version = elem.String();
+ } else if (elem.fieldNameStringData() != "maxTimeMS") {
+ continue;
} else {
uasserted(ErrorCodes::FailedToParse,
str::stream()