summaryrefslogtreecommitdiff
path: root/buildscripts/resmokeconfig
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2016-10-18 17:58:00 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2016-10-19 09:31:29 -0400
commit59bfd84718bc931f3871a8d53e53edb004434788 (patch)
treeb99dc16fb0c4e785e79d1bce78f431addff8ef2c /buildscripts/resmokeconfig
parentf597163d0007bff21f3496f238fb58b7bbdce479 (diff)
downloadmongo-59bfd84718bc931f3871a8d53e53edb004434788.tar.gz
SERVER-26365 Forward port changes to merge_chunks_test.js to master
Diffstat (limited to 'buildscripts/resmokeconfig')
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml2
1 files changed, 2 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 f53188e0bff..7e460af587b 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
@@ -79,6 +79,8 @@ selector:
# This test checks the behavior of a singleBatch fix for mongos that does not exist in 3.2.
# Enable when 3.4 becomes last-stable or after backporting SERVER-26112 to the 3.2 branch.
- jstests/sharding/sharded_limit_batchsize.js
+ # Enable when 3.2.11 becomes last-stable
+ - jstests/sharding/merge_chunks_test.js
executor:
js_test: