summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorCharlie Swanson <charlie.swanson@mongodb.com>2018-11-29 17:39:33 -0500
committerCharlie Swanson <charlie.swanson@mongodb.com>2019-01-16 10:09:59 -0500
commit0cb2195939494660334db8e9d0a52509caeb621c (patch)
tree2d71e10270020f2e7ea8bf3bfb812b13f83abbca /buildscripts
parentd29f140ae0e69057d8b1801f4d2a993612fa5bcb (diff)
downloadmongo-0cb2195939494660334db8e9d0a52509caeb621c.tar.gz
SERVER-38311 Adjust $out merging strategy
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index de2b7f8eec6..088e63f1a9b 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -43,6 +43,7 @@ selector:
- jstests/sharding/lookup_stale_mongos.js
- jstests/sharding/out_cannot_run_on_mongos.js
- jstests/sharding/out_command_options.js
+ - jstests/sharding/out_does_not_force_merge.js
- jstests/sharding/out_from_stale_mongos.js
- jstests/sharding/out_hashed_shard_key.js
- jstests/sharding/out_stale_unique_key.js