From 95a2c373a227e6e3528bfb59facf35d39f603a5c Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben.bridgewater@fintura.de>
Date: Wed, 16 Sep 2015 05:58:29 +0200
Subject: [PATCH] Fix broken build. The merge had a small conflict

---
 test/node_redis.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/node_redis.spec.js b/test/node_redis.spec.js
index cd9e5dba42..e650dbac8f 100644
--- a/test/node_redis.spec.js
+++ b/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
                         });