Merge commit '4738b880a6c29a6d10dda3ad178f35a54bd576d3'

Conflicts:
	NEWS.md
	package.json

NEWS.md

@@ -1,4 +1,12 @@
-1.11.0 -- 2014-MM-DD
+1.11.1 -- 2014-05-07
+--------------------
+
+Enhancements:
+
+ - Upgrade Windshaft to 0.21.0, see
+ http://github.com/CartoDB/Windshaft/blob/0.21.0/NEWS
+
+1.11.0 -- 2014-04-28
 --------------------
 
 New features:
@@ -19,7 +27,7 @@ Bug fixes:
  - Fix X-Cache-Channel of tiles accessed via signed token (#188)
 
 1.10.1 -- 2014-03-21
--------------------
+--------------------
 
 Bug fixes:
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "dependencies": {
     "node-varnish": {
       "version": "0.3.0",
@@ -11,7 +11,7 @@
     },
     "windshaft": {
       "version": "0.20.0",
-      "from": "http://github.com/CartoDB/Windshaft/tarball/0.20.0",
+      "from": "http://github.com/CartoDB/Windshaft/tarball/0.21.0",
       "dependencies": {
         "grainstore": {
           "version": "0.18.1",
@@ -469,14 +469,14 @@
         }
       }
     },
-    "strftime": {
-      "version": "0.6.2"
+    "redis": {
+      "version": "0.8.6"
     },
     "semver": {
       "version": "1.1.4"
     },
-    "redis": {
-      "version": "0.8.6"
+    "strftime": {
+      "version": "0.6.2"
     },
     "mocha": {
       "version": "1.14.0",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.11.0",
+    "version": "1.11.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -24,7 +24,7 @@
     "dependencies": {
         "node-varnish": "http://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "http://github.com/CartoDB/Windshaft/tarball/0.20.0",
+        "windshaft"  : "http://github.com/CartoDB/Windshaft/tarball/0.21.0",
         "step": "0.0.x",
         "request": "2.9.202",
         "cartodb-redis": "~0.3.0",