Merge branch 'master' of https://github.com/ouotuo/node_redis into ouotuo-master

index.js

@@ -916,6 +916,14 @@ RedisClient.prototype.pub_sub_command = function (command_obj) {
 
 RedisClient.prototype.end = function () {
     this.stream._events = {};
+
+    //clear retry_timer
+    if(this.retry_timer){
+        clearTimeout(this.retry_timer);
+        this.retry_timer=null;
+    }
+    this.stream.on("error", function(){});
+
     this.connected = false;
     this.ready = false;
     this.closing = true;