From cf01f01bc921a3c6a48baea130b687290891a0bd Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 26 Feb 2014 17:26:17 +0100
Subject: [PATCH] Upgrades windshaft to 0.19.1 with many performance
 improvements

Among others:

- Improve speed of instanciating a map
- Give meaningful error on attempts to use map tokens with
  attribute service

Closes #156 -- CDB-1796 #resolve
Closes #147
Closes #159
Closes #165
---
 NEWS.md             |  8 +++++++-
 npm-shrinkwrap.json | 25 ++++++++++---------------
 package.json        |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 0bda50fe..790200b9 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,7 +1,13 @@
 1.8.3 -- 2014-MM-DD
 -------------------
 
-Bug fixes:
+Enhancements:
+
+ - Upgrades windshaft to 0.19.1 with many performance improvements,
+   See node_modules/windshaft/NEWS 
+ - Improve speed of instanciating a map (#147, #159, #165)
+ - Give meaningful error on attempts to use map tokens
+   with attribute service (#156)
 
 1.8.2 -- 2014-02-25
 -------------------
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a2365c2a..ff32a74c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "dependencies": {
     "node-varnish": {
       "version": "0.2.0",
@@ -10,8 +10,8 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.19.0",
-      "from": "http://github.com/CartoDB/Windshaft/tarball/0.19.0-rc1",
+      "version": "0.19.1",
+      "from": "http://github.com/CartoDB/Windshaft/tarball/0.19.1",
       "dependencies": {
         "grainstore": {
           "version": "0.18.0",
@@ -191,7 +191,7 @@
                               }
                             },
                             "readable-stream": {
-                              "version": "1.0.25-1",
+                              "version": "1.0.26",
                               "dependencies": {
                                 "string_decoder": {
                                   "version": "0.10.25-1"
@@ -220,15 +220,10 @@
                           }
                         },
                         "rc": {
-                          "version": "0.3.3",
+                          "version": "0.3.4",
                           "dependencies": {
-                            "optimist": {
-                              "version": "0.3.7",
-                              "dependencies": {
-                                "wordwrap": {
-                                  "version": "0.0.2"
-                                }
-                              }
+                            "minimist": {
+                              "version": "0.0.8"
                             },
                             "deep-extend": {
                               "version": "0.2.8"
@@ -258,7 +253,7 @@
                       "version": "0.0.2"
                     },
                     "minimist": {
-                      "version": "0.0.7"
+                      "version": "0.0.8"
                     }
                   }
                 }
@@ -308,7 +303,7 @@
           }
         },
         "tilelive-mapnik": {
-          "version": "0.6.5",
+          "version": "0.6.7",
           "dependencies": {
             "eio": {
               "version": "0.2.2"
@@ -349,7 +344,7 @@
                   "version": "0.0.2"
                 },
                 "minimist": {
-                  "version": "0.0.7"
+                  "version": "0.0.8"
                 }
               }
             }
diff --git a/package.json b/package.json
index 5aca0c0b..d86be4cd 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "node-varnish": "http://github.com/Vizzuality/node-varnish/tarball/v0.2.0",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "http://github.com/CartoDB/Windshaft/tarball/0.19.0",
+        "windshaft"  : "http://github.com/CartoDB/Windshaft/tarball/0.19.1",
         "step": "0.0.x",
         "request": "2.9.202",
         "cartodb-redis": "~0.3.0",