From 333de67ed5e2de8ee83f2e75946161f952040b32 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 12 Feb 2014 22:51:52 +0100
Subject: [PATCH] Require Windshaft 0.18.0

---
 NEWS.md             |  1 +
 npm-shrinkwrap.json | 22 +++++++++++-----------
 package.json        |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 3870d215..f578299e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -8,6 +8,7 @@ Enhancements:
  * Add support for specifying a varnish password
  * Avoid sending multiple varnish invalidation at once (#135)
  * Tested with node-0.10
+ * Use single redis pooler for torque and grainstore
 
 1.7.1 -- 2014-02-11
 -------------------
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 6e876a75..f1266041 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "dependencies": {
     "node-varnish": {
       "version": "0.2.0",
@@ -10,12 +10,9 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.17.2",
-      "from": "http://github.com/CartoDB/Windshaft/tarball/0.17.2",
+      "version": "0.18.0",
+      "from": "http://github.com/CartoDB/Windshaft/tarball/0.18.0",
       "dependencies": {
-        "node-statsd": {
-          "version": "0.0.7"
-        },
         "grainstore": {
           "version": "0.17.1",
           "dependencies": {
@@ -197,7 +194,7 @@
                               "version": "1.0.25-1",
                               "dependencies": {
                                 "string_decoder": {
-                                  "version": "0.10.25"
+                                  "version": "0.10.25-1"
                                 }
                               }
                             },
@@ -379,6 +376,9 @@
         },
         "torque.js": {
           "version": "2.2.00"
+        },
+        "node-statsd": {
+          "version": "0.0.7"
         }
       }
     },
@@ -413,14 +413,14 @@
     "lzma": {
       "version": "1.2.3"
     },
-    "redis": {
-      "version": "0.8.6"
+    "strftime": {
+      "version": "0.6.2"
     },
     "semver": {
       "version": "1.1.4"
     },
-    "strftime": {
-      "version": "0.6.2"
+    "redis": {
+      "version": "0.8.6"
     },
     "mocha": {
       "version": "1.14.0",
diff --git a/package.json b/package.json
index 15afeb6e..d972b397 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "node-varnish": "~0.2.0",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "~0.17.2",
+        "windshaft"  : "~0.18.0",
         "step": "0.0.x",
         "request": "2.9.202",
         "cartodb-redis": "~0.3.0",