From b92624408508f7b56cbc121c8a4624df509f40f5 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 28 Apr 2016 17:30:57 +0200
Subject: [PATCH] Upgrades windshaft to 1.19.0

---
 NEWS.md             |  5 ++++-
 npm-shrinkwrap.json | 18 +++++++++---------
 package.json        |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index a17fcdfe..ef3292bd 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,9 +1,12 @@
 # Changelog
 
-## 2.35.1
+## 2.36.0
 
 Released 2016-mm-dd
 
+Announcements:
+ - Upgrades windshaft to [1.19.0](https://github.com/CartoDB/Windshaft/releases/tag/1.19.0)
+
 
 ## 2.35.0
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 5c4c6585..7afac823 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.35.1",
+  "version": "2.36.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -80,7 +80,7 @@
         },
         "type-is": {
           "version": "1.6.12",
-          "from": "type-is@>=1.6.6 <1.7.0",
+          "from": "type-is@>=1.6.10 <1.7.0",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
           "dependencies": {
             "media-typer": {
@@ -770,7 +770,7 @@
             },
             "statuses": {
               "version": "1.2.1",
-              "from": "statuses@>=1.2.1 <1.3.0",
+              "from": "statuses@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
             }
           }
@@ -995,7 +995,7 @@
           "dependencies": {
             "async": {
               "version": "1.5.2",
-              "from": "async@>=1.5.2 <2.0.0",
+              "from": "async@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
             }
           }
@@ -1291,9 +1291,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.18.0",
-      "from": "windshaft@1.18.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.18.0.tgz",
+      "version": "1.19.0",
+      "from": "windshaft@1.19.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.19.0.tgz",
       "dependencies": {
         "abaculus": {
           "version": "1.1.0-cdb4",
@@ -1314,8 +1314,8 @@
         },
         "carto": {
           "version": "0.15.1-cdb1",
-          "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
-          "resolved": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
+          "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
+          "resolved": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
           "dependencies": {
             "mapnik-reference": {
               "version": "6.0.5",
diff --git a/package.json b/package.json
index 36586a1e..96572fcb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.35.1",
+    "version": "2.36.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -26,7 +26,7 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "1.18.0",
+        "windshaft": "1.19.0",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",