From 7a5d73f9dfd15fa01083f6564923f087e2dfa338 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Sun, 5 Jul 2015 20:58:39 +0200
Subject: [PATCH] Upgrades redis-mpool

---
 NEWS.md             |  3 +++
 npm-shrinkwrap.json | 51 +++++++++++++++++++++++++++++++++++++--------
 package.json        |  2 +-
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index f1d73e98..5cc28b22 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,9 @@
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades redis-mpool to [0.4.0](https://github.com/CartoDB/node-redis-mpool/releases/tag/0.4.0)
+
 
 ## 2.6.1
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c93b40d6..363bee80 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -180,9 +180,9 @@
               "resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"
             },
             "tunnel-agent": {
-              "version": "0.4.0",
+              "version": "0.4.1",
               "from": "tunnel-agent@~0.4.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
             },
             "tough-cookie": {
               "version": "2.0.0",
@@ -276,9 +276,9 @@
               "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
               "dependencies": {
                 "bluebird": {
-                  "version": "2.9.30",
+                  "version": "2.9.32",
                   "from": "bluebird@^2.9.30",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz"
+                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.32.tgz"
                 },
                 "chalk": {
                   "version": "1.1.0",
@@ -437,9 +437,8 @@
       "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz"
     },
     "redis-mpool": {
-      "version": "0.3.0",
-      "from": "redis-mpool@~0.3.0",
-      "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz",
+      "version": "0.4.0",
+      "from": "redis-mpool@~0.4.0",
       "dependencies": {
         "generic-pool": {
           "version": "2.1.1",
@@ -2741,6 +2740,40 @@
             }
           }
         },
+        "redis-mpool": {
+          "version": "0.3.0",
+          "from": "redis-mpool@~0.3.0",
+          "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz",
+          "dependencies": {
+            "generic-pool": {
+              "version": "2.1.1",
+              "from": "generic-pool@~2.1.1",
+              "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz"
+            },
+            "redis": {
+              "version": "0.12.1",
+              "from": "redis@~0.12.1",
+              "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
+            },
+            "hiredis": {
+              "version": "0.1.17",
+              "from": "hiredis@~0.1.17",
+              "resolved": "https://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz",
+              "dependencies": {
+                "bindings": {
+                  "version": "1.2.1",
+                  "from": "bindings@*",
+                  "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+                },
+                "nan": {
+                  "version": "1.1.2",
+                  "from": "nan@~1.1.0",
+                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
+                }
+              }
+            }
+          }
+        },
         "carto": {
           "version": "0.15.1-cdb1",
           "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
@@ -2866,9 +2899,9 @@
               "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
             },
             "tunnel-agent": {
-              "version": "0.4.0",
+              "version": "0.4.1",
               "from": "tunnel-agent@~0.4.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
             },
             "tough-cookie": {
               "version": "2.0.0",
diff --git a/package.json b/package.json
index 9a68d304..44d2e0de 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
         "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
         "fastly-purge": "~1.0.0",
-        "redis-mpool": "~0.3.0",
+        "redis-mpool": "~0.4.0",
         "lzma": "~1.3.7",
         "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb"
     },