From 494e2f48d53c810c22750d63046997219e88f9e7 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 24 Oct 2014 17:07:36 +0200
Subject: [PATCH] Release 1.21.0

---
 NEWS.md             |  2 +-
 npm-shrinkwrap.json | 20 ++++++++++++--------
 package.json        |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 1d439c47..a7986e34 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-1.20.3 -- 2014-mm-dd
+1.21.0 -- 2014-10-24
 --------------------
 
 New features:
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3815766f..13492724 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.20.3",
+  "version": "1.21.0",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -92,7 +92,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2"
+              "from": "inherits@~2.0.1"
             }
           }
         }
@@ -147,7 +147,8 @@
       "dependencies": {
         "node-uuid": {
           "version": "1.4.1",
-          "from": "node-uuid@1.4.x"
+          "from": "node-uuid@1.4.x",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
         },
         "lru-cache": {
           "version": "2.2.4",
@@ -249,15 +250,17 @@
                     },
                     "node-uuid": {
                       "version": "1.4.1",
-                      "from": "node-uuid@~1.4.0"
+                      "from": "node-uuid@~1.4.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
                     },
                     "tough-cookie": {
                       "version": "0.12.1",
                       "from": "tough-cookie@>=0.12.0",
                       "dependencies": {
                         "punycode": {
-                          "version": "1.3.1",
-                          "from": "punycode@>=0.2.0"
+                          "version": "1.3.2",
+                          "from": "punycode@>=0.2.0",
+                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
                         }
                       }
                     },
@@ -1510,7 +1513,8 @@
             },
             "mapnik-vector-tile": {
               "version": "0.5.5",
-              "from": "mapnik-vector-tile@0.5.5"
+              "from": "mapnik-vector-tile@0.5.5",
+              "resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz"
             },
             "node-pre-gyp": {
               "version": "0.5.25",
@@ -1902,7 +1906,7 @@
             },
             "sphericalmercator": {
               "version": "1.0.2",
-              "from": "sphericalmercator@~1.0.2"
+              "from": "sphericalmercator@~1.0.1"
             }
           }
         },
diff --git a/package.json b/package.json
index 6916a884..bc9757d0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.20.3",
+    "version": "1.21.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"