From 6effcfb62e7d6e44cffdf3f8b6e88c0db9dcc523 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 9 Oct 2015 15:50:39 +0200
Subject: [PATCH] Upgrades windshaft to 1.1.0 and fastly-purge to 1.0.1

---
 NEWS.md             |  6 +++++-
 npm-shrinkwrap.json | 32 ++++++++++++++++----------------
 package.json        |  6 +++---
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 15c8e3f4..dde70c55 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,9 +1,13 @@
 # Changelog
 
-## 2.14.2
+## 2.15.0
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades windshaft to [1.1.0](https://github.com/CartoDB/Windshaft/releases/tag/1.1.0)
+ - Upgrades fastly-purge to [1.0.1](https://github.com/CartoDB/node-fastly-purge/releases/tag/1.0.1)
+
 
 ## 2.14.1
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 6370ac3a..4a15388c 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.14.2",
+  "version": "2.15.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.1",
@@ -58,7 +58,7 @@
         },
         "qs": {
           "version": "5.1.0",
-          "from": "qs@5.1.0",
+          "from": "qs@~5.1.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
         },
         "raw-body": {
@@ -406,8 +406,8 @@
       }
     },
     "fastly-purge": {
-      "version": "1.0.0",
-      "from": "fastly-purge@~1.0.0"
+      "version": "1.0.1",
+      "from": "fastly-purge@~1.0.1"
     },
     "log4js": {
       "version": "0.6.25",
@@ -441,7 +441,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"
             }
           }
@@ -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": {
@@ -552,9 +552,9 @@
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "util-deprecate": {
-                  "version": "1.0.1",
+                  "version": "1.0.2",
                   "from": "util-deprecate@~1.0.1",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
+                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                 }
               }
             }
@@ -620,9 +620,9 @@
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
         },
         "tough-cookie": {
-          "version": "2.0.0",
+          "version": "2.2.0",
           "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
         },
         "http-signature": {
           "version": "0.11.0",
@@ -711,9 +711,9 @@
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
           "dependencies": {
             "bluebird": {
-              "version": "2.10.1",
+              "version": "2.10.2",
               "from": "bluebird@^2.9.30",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.1.tgz"
+              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"
             },
             "chalk": {
               "version": "1.1.1",
@@ -827,8 +827,8 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.0.1",
-      "from": "windshaft@~1.0.1",
+      "version": "1.1.0",
+      "from": "windshaft@~1.1.0",
       "dependencies": {
         "mapnik": {
           "version": "1.4.15-cdb2",
@@ -1301,9 +1301,9 @@
                       "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"
                     },
                     "tough-cookie": {
-                      "version": "2.0.0",
+                      "version": "2.2.0",
                       "from": "tough-cookie@>=0.12.0",
-                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz"
+                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.0.tgz"
                     },
                     "form-data": {
                       "version": "0.1.4",
diff --git a/package.json b/package.json
index 473fbbdf..8523e4d3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.14.2",
+    "version": "2.15.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -29,13 +29,13 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "~1.0.1",
+        "windshaft": "~1.1.0",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",
         "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
-        "fastly-purge": "~1.0.0",
+        "fastly-purge": "~1.0.1",
         "redis-mpool": "~0.4.0",
         "lru-cache": "2.6.5",
         "lzma": "~1.3.7",