New upstream version 6.0.20upstream

1 files changed, 1 insertions, 2 deletions

diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 9136fa49333..1319746ea1a 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -1034,8 +1034,7 @@ var ShardingTest = function(params) {
     assert(isObject(params), 'ShardingTest configuration must be a JSON object');
 
     var testName = params.name || jsTest.name();
-    var otherParams = Object.merge(params, params.other || {});
-
+    var otherParams = Object.deepMerge(params, params.other || {});
     var numShards = otherParams.hasOwnProperty('shards') ? otherParams.shards : 2;
     var mongosVerboseLevel = otherParams.hasOwnProperty('verbose') ? otherParams.verbose : 1;
     var numMongos = otherParams.hasOwnProperty('mongos') ? otherParams.mongos : 1;