From d7181ec6c21278b3b8535cebf4b1857fdd5e63ac Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 21 Oct 2015 18:38:19 +0200
Subject: [PATCH] Upgrades windshaft to 1.2.0

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

diff --git a/NEWS.md b/NEWS.md
index 5a57ba25..d9d5aee0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,9 +1,12 @@
 # Changelog
 
-## 2.15.2
+## 2.16.0
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades windshaft to [1.2.0](https://github.com/CartoDB/Windshaft/releases/tag/1.2.0)
+
 
 ## 2.15.1
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c9e1ac1c..f9a2d6e0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.15.2",
+  "version": "2.16.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.1",
@@ -533,7 +533,7 @@
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "inherits@2",
+                  "from": "inherits@~2.0.1",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "isarray": {
@@ -827,8 +827,8 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.1.1",
-      "from": "windshaft@~1.1.1",
+      "version": "1.2.0",
+      "from": "windshaft@~1.2.0",
       "dependencies": {
         "mapnik": {
           "version": "1.4.15-cdb2",
@@ -1216,8 +1216,8 @@
           }
         },
         "grainstore": {
-          "version": "1.0.0",
-          "from": "grainstore@~1.0.0",
+          "version": "1.1.0",
+          "from": "grainstore@~1.1.0",
           "dependencies": {
             "carto": {
               "version": "0.9.5-cdb2",
@@ -2966,6 +2966,11 @@
                   }
                 }
               }
+            },
+            "semver": {
+              "version": "5.0.3",
+              "from": "semver@~5.0.3",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
             }
           }
         },
diff --git a/package.json b/package.json
index b527f012..de167722 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.15.2",
+    "version": "2.16.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -29,7 +29,7 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "~1.1.1",
+        "windshaft": "~1.2.0",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",