summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jstests/noPassthrough/change_streams_cluster_parameter.js1
-rw-r--r--jstests/noPassthrough/cluster_server_parameter_refresher.js1
-rw-r--r--src/mongo/idl/cluster_server_parameter.idl3
3 files changed, 2 insertions, 3 deletions
diff --git a/jstests/noPassthrough/change_streams_cluster_parameter.js b/jstests/noPassthrough/change_streams_cluster_parameter.js
index 945d41605c5..6297c785cd0 100644
--- a/jstests/noPassthrough/change_streams_cluster_parameter.js
+++ b/jstests/noPassthrough/change_streams_cluster_parameter.js
@@ -1,7 +1,6 @@
// Tests the 'changeStreams' cluster-wide configuration parameter on the replica sets and the
// sharded cluster.
// @tags: [
-// featureFlagClusterWideConfig,
// requires_replication,
// requires_sharding,
// featureFlagServerlessChangeStreams,
diff --git a/jstests/noPassthrough/cluster_server_parameter_refresher.js b/jstests/noPassthrough/cluster_server_parameter_refresher.js
index 8edc13641eb..b22994dc6ad 100644
--- a/jstests/noPassthrough/cluster_server_parameter_refresher.js
+++ b/jstests/noPassthrough/cluster_server_parameter_refresher.js
@@ -4,7 +4,6 @@
* @tags: [
* # Requires all nodes to be running at least 6.1.
* requires_fcv_61,
- * featureFlagClusterWideConfigM2,
* does_not_support_stepdowns,
* requires_replication,
* requires_sharding
diff --git a/src/mongo/idl/cluster_server_parameter.idl b/src/mongo/idl/cluster_server_parameter.idl
index 14622beeae0..ff695a437f9 100644
--- a/src/mongo/idl/cluster_server_parameter.idl
+++ b/src/mongo/idl/cluster_server_parameter.idl
@@ -90,7 +90,8 @@ feature_flags:
featureFlagClusterWideConfigM2:
description: Mechanism for cluster-wide configuration options, milestone 2
cpp_varname: gFeatureFlagClusterWideConfigM2
- default: false
+ default: true
+ version: 6.1
server_parameters:
testIntClusterParameter: