Fix broken build. The merge had a small conflict

Author: Ruben Bridgewater

test/node_redis.spec.js

@@ -736,7 +736,7 @@ describe("The node_redis client", function () {
                 describe('true', function () {
                     it("does not return an error and enqueues operation", function (done) {
                         var client = redis.createClient(9999, null, {
-                            max_attempts: 1,
+                            max_attempts: 0,
                             parser: parser
                         });