Merge cleanup.

Gruntfile.js

@@ -49,7 +49,17 @@ module.exports = function(grunt) {
                 clearRequireCache: false,
                 colors: false
             },
-            src: ['test/integration/**/*.js']
+            src: ['test/integration/core/*.js', 'test/integration/crdt/*.js', 'test/integration/kv/*.js', 'test/integration/mapreduce/*.js', 'test/integration/yokozuna/*.js']
+        },
+        timeseries: {
+            options: {
+                reporter: 'spec',
+                captureFile: 'integration-test-results.txt',
+                quiet: false,
+                clearRequireCache: false,
+                colors: false
+            },
+            src: ['test/integration/ts/*.js']
         },
         security: {
             options: {

index.js

@@ -1,5 +1,3 @@
 'use strict';
 
-'use strict';
-
 module.exports = require('./lib/client');

lib/commands/crdt/updateset.js

@@ -55,7 +55,6 @@ var SetOp = rpb.getProtoFor('SetOp');
  */
 function UpdateSet(options, callback) {
     CommandBase.call(this, 'DtUpdateReq', 'DtUpdateResp', callback);
-
     var self = this;
     Joi.validate(options, schema, function(err, options) {
         if (err) {

lib/core/riaknode.js

@@ -108,7 +108,7 @@ RiakNode.prototype.start = function(callback) {
 
     // Fire up connection pool
     var funcs = [];
-    for (i = 0; i < this.minConnections; i++) {
+    for (var i = 0; i < this.minConnections; i++) {
         funcs.push(makeNewConnectionFunc(this));
     }
 
@@ -433,7 +433,7 @@ var State = Object.freeze({ CREATED : 0,
 var defaultRemoteAddress = "127.0.0.1";
 var defaultRemotePort = 8087;
 var defaultMinConnections = 1;
-var defaultMaxConnections = 10000; // magic number but close enough
+var defaultMaxConnections = 128;
 var defaultIdleTimeout = 3000;
 var defaultConnectionTimeout = 0;
 var defaultHealthCheck = new Ping(function (){});