From 27ff1ac4f6cd92a9eb10b0265a506b707b456bc9 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Sun, 5 Jul 2015 21:16:12 +0200
Subject: [PATCH] Upgrades windshaft to 0.47.0

---
 NEWS.md             |  1 +
 npm-shrinkwrap.json | 79 +++------------------------------------------
 package.json        |  2 +-
 3 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index db575294..c3216c6e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,7 @@
 Released 2015-mm-dd
 
 Announcements:
+ - Upgrades windshaft to [0.47.0](https://github.com/CartoDB/Windshaft/releases/tag/0.47.0)
  - Upgrades redis-mpool to [0.4.0](https://github.com/CartoDB/node-redis-mpool/releases/tag/0.4.0)
 
 New features:
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 84494142..a2d734e2 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -485,9 +485,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.46.1",
-      "from": "windshaft@0.46.1",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.46.1.tgz",
+      "version": "0.47.0",
+      "from": "windshaft@0.47.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.47.0.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -495,44 +495,9 @@
           "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d"
         },
         "grainstore": {
-          "version": "0.23.0",
-          "from": "grainstore@~0.23.0",
-          "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-0.23.0.tgz",
+          "version": "1.0.0",
+          "from": "grainstore@~1.0.0",
           "dependencies": {
-            "redis-mpool": {
-              "version": "0.1.0",
-              "from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
-              "resolved": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
-              "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.9.5-cdb2",
               "from": "https://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
@@ -2740,40 +2705,6 @@
             }
           }
         },
-        "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",
diff --git a/package.json b/package.json
index 57ffc8e5..a3ac6a02 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.46.1",
+        "windshaft": "0.47.0",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",