From e68ba95fedf8d1aff0a1132d86df00f4113ed0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Mart=C3=ADn?= <oleurud@gmail.com>
Date: Thu, 18 Jan 2018 15:16:40 +0100
Subject: [PATCH] adding cartodb-redis with redis4 support

---
 package.json |  2 +-
 yarn.lock    | 35 +++++++++++++++--------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 45710e05..fac26774 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "camshaft": "0.60.0",
     "cartodb-psql": "0.10.2",
     "cartodb-query-tables": "0.3.0",
-    "cartodb-redis": "0.14.0",
+    "cartodb-redis": "cartodb/node-cartodb-redis#redis4",
     "debug": "^3.1.0",
     "dot": "~1.0.2",
     "express": "~4.16.0",
diff --git a/yarn.lock b/yarn.lock
index ac8c34b5..3e49eeaa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -295,7 +295,7 @@ cartodb-query-tables@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/cartodb-query-tables/-/cartodb-query-tables-0.3.0.tgz#56e18d869666eb2e8e2cb57d0baf3acc923f8756"
 
-cartodb-redis@0.14.0:
+cartodb-redis@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/cartodb-redis/-/cartodb-redis-0.14.0.tgz#6f82fdb3e5b7c8005dbaccd6172c1706c4378df2"
   dependencies:
@@ -303,6 +303,14 @@ cartodb-redis@0.14.0:
     redis-mpool "~0.4.1"
     underscore "~1.6.0"
 
+cartodb-redis@cartodb/node-cartodb-redis#redis4:
+  version "0.14.1"
+  resolved "https://codeload.github.com/cartodb/node-cartodb-redis/tar.gz/5fb6f72794ee049f56ba9a2f861e3be4baae7d8a"
+  dependencies:
+    dot "~1.0.2"
+    redis-mpool cartodb/node-redis-mpool#redis4
+    underscore "~1.6.0"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1395,18 +1403,18 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@^2.0.8, nan@^2.3.4, nan@^2.4.0, nan@~2.4.0:
+nan@^2.0.8, nan@^2.3.4, nan@~2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.4.0.tgz#fb3c59d45fe4effe215f0b890f8adf6eb32d2232"
 
+nan@^2.4.0, nan@~2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
+
 nan@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
-nan@~2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
-
 ncp@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
@@ -1819,7 +1827,7 @@ redis-commands@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"
 
-redis-mpool@cartodb/node-redis-mpool#redis4:
+redis-mpool@cartodb/node-redis-mpool#redis4, redis-mpool@~0.4.1:
   version "0.4.2"
   resolved "https://codeload.github.com/cartodb/node-redis-mpool/tar.gz/a375b741a6001d2e9d875a50d6002f56a3be96a0"
   dependencies:
@@ -1828,15 +1836,6 @@ redis-mpool@cartodb/node-redis-mpool#redis4:
     redis "^2.8.0"
     underscore "~1.6.0"
 
-redis-mpool@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.4.1.tgz#d917c0a4ed57a1291a9c6eb35434e6c0b7046f80"
-  dependencies:
-    generic-pool "~2.1.1"
-    hiredis "~0.5.0"
-    redis "~0.12.1"
-    underscore "~1.6.0"
-
 redis-parser@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
@@ -1849,10 +1848,6 @@ redis@2.8.0, redis@^2.8.0:
     redis-commands "^1.2.0"
     redis-parser "^2.6.0"
 
-redis@~0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-0.12.1.tgz#64df76ad0fc8acebaebd2a0645e8a48fac49185e"
-
 repeat-string@^1.5.2:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"