From 94e38cef9d9b9153f1e11db0cdbbc64c6d148bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?=
 <juanignaciosl@gmail.com>
Date: Tue, 30 Jun 2015 11:00:32 +0200
Subject: [PATCH 01/14] Update instructions

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index aa2c7028..0f5c154f 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,14 @@ happen to have startup errors you may need to force rebuilding those
 modules. At any time just wipe out the node_modules/ directory and run
 ```npm install``` again.
 
+Upgrading
+---------
+
+Pull master branch and then reinstall dependencies:
+
+```
+make clean all
+```
 
 Run
 ---

From fcb0a4a7e6c3f0e82f0f9489e7a1d109be8fc33c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?=
 <juanignaciosl@gmail.com>
Date: Wed, 1 Jul 2015 07:22:37 +0200
Subject: [PATCH 02/14] Less specific upgrade help

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0f5c154f..dc28f532 100644
--- a/README.md
+++ b/README.md
@@ -62,10 +62,10 @@ modules. At any time just wipe out the node_modules/ directory and run
 Upgrading
 ---------
 
-Pull master branch and then reinstall dependencies:
+Checkout your commit/branch. If you need to reinstall dependencies (you can check [NEWS](NEWS.md)) do the following:
 
 ```
-make clean all
+rm -rf node_modules; npm install
 ```
 
 Run

From 75ddcbbd01becf2dd9b36a721a895b126f60f4a2 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 2 Jul 2015 13:28:37 +0200
Subject: [PATCH 03/14] Updates windshaft to 0.46.0 and documents new config
 formatMetatile

---
 NEWS.md                                    |  6 +-
 config/environments/development.js.example |  6 ++
 config/environments/production.js.example  |  6 ++
 config/environments/staging.js.example     |  6 ++
 config/environments/test.js.example        |  6 ++
 npm-shrinkwrap.json                        | 77 ++++++++++------------
 package.json                               |  4 +-
 7 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 18b454fe..bcc7befe 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,9 +1,13 @@
 # Changelog
 
-## 2.5.1
+## 2.6.0
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades windshaft to [0.46.0](https://github.com/CartoDB/Windshaft/releases/tag/0.46.0)
+ - New config to set metatile by format
+
 
 ## 2.5.0
 
diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 405c0017..497e3421 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -96,6 +96,12 @@ var config = {
           // wasted time.
           metatile: 2,
 
+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
           // Buffer size is the tickness in pixel of a buffer
           // around the rendered (meta?)tile.
           //
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index 516e18a3..df0b75eb 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -90,6 +90,12 @@ var config = {
           // wasted time.
           metatile: 2,
 
+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
           // Buffer size is the tickness in pixel of a buffer
           // around the rendered (meta?)tile.
           //
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index 6495a1da..fd082a9c 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -90,6 +90,12 @@ var config = {
           // wasted time.
           metatile: 2,
 
+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
           // Buffer size is the tickness in pixel of a buffer
           // around the rendered (meta?)tile.
           //
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 39fb2dbb..94b92807 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -90,6 +90,12 @@ var config = {
           // wasted time.
           metatile: 2,
 
+          // Override metatile behaviour depending on the format
+          formatMetatile: {
+              png: 2,
+              'grid.json': 1
+          },
+
           // Buffer size is the tickness in pixel of a buffer
           // around the rendered (meta?)tile.
           //
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e8f837c5..58cc04ff 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -134,19 +134,19 @@
               "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc1.tgz",
               "dependencies": {
                 "async": {
-                  "version": "1.2.1",
+                  "version": "1.3.0",
                   "from": "async@^1.2.1",
-                  "resolved": "https://registry.npmjs.org/async/-/async-1.2.1.tgz"
+                  "resolved": "https://registry.npmjs.org/async/-/async-1.3.0.tgz"
                 },
                 "mime-types": {
-                  "version": "2.1.1",
+                  "version": "2.1.2",
                   "from": "mime-types@^2.1.1",
-                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz",
+                  "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.2.tgz",
                   "dependencies": {
                     "mime-db": {
-                      "version": "1.13.0",
-                      "from": "mime-db@~1.13.0",
-                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz"
+                      "version": "1.14.0",
+                      "from": "mime-db@~1.14.0",
+                      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz"
                     }
                   }
                 }
@@ -271,24 +271,24 @@
               "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
             },
             "har-validator": {
-              "version": "1.7.1",
+              "version": "1.8.0",
               "from": "har-validator@^1.6.1",
-              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz",
+              "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
               "dependencies": {
                 "bluebird": {
                   "version": "2.9.30",
-                  "from": "bluebird@^2.9.26",
+                  "from": "bluebird@^2.9.30",
                   "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz"
                 },
                 "chalk": {
-                  "version": "1.0.0",
+                  "version": "1.1.0",
                   "from": "chalk@^1.0.0",
-                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
+                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz",
                   "dependencies": {
                     "ansi-styles": {
-                      "version": "2.0.1",
-                      "from": "ansi-styles@^2.0.1",
-                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
+                      "version": "2.1.0",
+                      "from": "ansi-styles@^2.1.0",
+                      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
                     },
                     "escape-string-regexp": {
                       "version": "1.0.3",
@@ -296,38 +296,33 @@
                       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                     },
                     "has-ansi": {
-                      "version": "1.0.3",
-                      "from": "has-ansi@^1.0.3",
-                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
+                      "version": "2.0.0",
+                      "from": "has-ansi@^2.0.0",
+                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
                       "dependencies": {
                         "ansi-regex": {
-                          "version": "1.1.1",
-                          "from": "ansi-regex@^1.1.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
-                        },
-                        "get-stdin": {
-                          "version": "4.0.1",
-                          "from": "get-stdin@^4.0.1",
-                          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+                          "version": "2.0.0",
+                          "from": "ansi-regex@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                         }
                       }
                     },
                     "strip-ansi": {
-                      "version": "2.0.1",
-                      "from": "strip-ansi@^2.0.1",
-                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+                      "version": "3.0.0",
+                      "from": "strip-ansi@^3.0.0",
+                      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                       "dependencies": {
                         "ansi-regex": {
-                          "version": "1.1.1",
-                          "from": "ansi-regex@^1.0.0",
-                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+                          "version": "2.0.0",
+                          "from": "ansi-regex@^2.0.0",
+                          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                         }
                       }
                     },
                     "supports-color": {
-                      "version": "1.3.1",
-                      "from": "supports-color@^1.3.0",
-                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"
+                      "version": "2.0.0",
+                      "from": "supports-color@^2.0.0",
+                      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
                     }
                   }
                 },
@@ -481,9 +476,9 @@
       "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
     },
     "step": {
-      "version": "0.0.5",
+      "version": "0.0.6",
       "from": "step@~0.0.5",
-      "resolved": "https://registry.npmjs.org/step/-/step-0.0.5.tgz"
+      "resolved": "https://registry.npmjs.org/step/-/step-0.0.6.tgz"
     },
     "underscore": {
       "version": "1.6.0",
@@ -491,9 +486,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.45.0",
-      "from": "windshaft@0.45.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.45.0.tgz",
+      "version": "0.46.0",
+      "from": "windshaft@0.46.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.46.0.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
diff --git a/package.json b/package.json
index c05762c3..519aba07 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.5.1",
+    "version": "2.6.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.45.0",
+        "windshaft": "0.46.0",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",

From 3ff8571f4aafa4373aa46208840498ddbc630071 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 2 Jul 2015 14:11:39 +0200
Subject: [PATCH 04/14] Release 2.6.0

---
 NEWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index bcc7befe..ddcc4949 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 ## 2.6.0
 
-Released 2015-mm-dd
+Released 2015-07-02
 
 Announcements:
  - Upgrades windshaft to [0.46.0](https://github.com/CartoDB/Windshaft/releases/tag/0.46.0)

From 7168e4410ca6254cc6d71833b7a534dfd5adca8d Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 2 Jul 2015 14:12:41 +0200
Subject: [PATCH 05/14] Stubs next version

---
 NEWS.md             | 5 +++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index ddcc4949..5757efe9 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.6.1
+
+Released 2015-mm-dd
+
+
 ## 2.6.0
 
 Released 2015-07-02
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 58cc04ff..082ff9e5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index 519aba07..c967f499 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.6.0",
+    "version": "2.6.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 333334e5985b56e75bccdf3ff3278c30e0c625c7 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 2 Jul 2015 15:41:48 +0200
Subject: [PATCH 06/14] Upgrades windshaft

---
 NEWS.md             | 3 +++
 npm-shrinkwrap.json | 6 +++---
 package.json        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 5757efe9..fa6f6b68 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,9 @@
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades windshaft to [0.46.1](https://github.com/CartoDB/Windshaft/releases/tag/0.46.1)
+
 
 ## 2.6.0
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 082ff9e5..c9652b64 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -486,9 +486,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.46.0",
-      "from": "windshaft@0.46.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.46.0.tgz",
+      "version": "0.46.1",
+      "from": "windshaft@0.46.1",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.46.1.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
diff --git a/package.json b/package.json
index c967f499..2f65e388 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.46.0",
+        "windshaft": "0.46.1",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",

From da55a3bdd2d207bebd3011969e87a2529c10c971 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 2 Jul 2015 15:47:40 +0200
Subject: [PATCH 07/14] Release 2.6.1

---
 NEWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index fa6f6b68..c434078a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 ## 2.6.1
 
-Released 2015-mm-dd
+Released 2015-07-02
 
 Announcements:
  - Upgrades windshaft to [0.46.1](https://github.com/CartoDB/Windshaft/releases/tag/0.46.1)

From 0d9f34fd48c10f752f9dbdb0fea21356891065c1 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 2 Jul 2015 15:48:58 +0200
Subject: [PATCH 08/14] Stubs next version

---
 NEWS.md             | 5 +++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index c434078a..f1d73e98 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.6.2
+
+Released 2015-mm-dd
+
+
 ## 2.6.1
 
 Released 2015-07-02
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c9652b64..c93b40d6 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index 2f65e388..9a68d304 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.6.1",
+    "version": "2.6.2",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 7a5d73f9dfd15fa01083f6564923f087e2dfa338 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Sun, 5 Jul 2015 20:58:39 +0200
Subject: [PATCH 09/14] Upgrades redis-mpool

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

diff --git a/NEWS.md b/NEWS.md
index f1d73e98..5cc28b22 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,9 @@
 
 Released 2015-mm-dd
 
+Announcements:
+ - Upgrades redis-mpool to [0.4.0](https://github.com/CartoDB/node-redis-mpool/releases/tag/0.4.0)
+
 
 ## 2.6.1
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index c93b40d6..363bee80 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -180,9 +180,9 @@
               "resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"
             },
             "tunnel-agent": {
-              "version": "0.4.0",
+              "version": "0.4.1",
               "from": "tunnel-agent@~0.4.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
             },
             "tough-cookie": {
               "version": "2.0.0",
@@ -276,9 +276,9 @@
               "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
               "dependencies": {
                 "bluebird": {
-                  "version": "2.9.30",
+                  "version": "2.9.32",
                   "from": "bluebird@^2.9.30",
-                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz"
+                  "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.32.tgz"
                 },
                 "chalk": {
                   "version": "1.1.0",
@@ -437,9 +437,8 @@
       "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz"
     },
     "redis-mpool": {
-      "version": "0.3.0",
-      "from": "redis-mpool@~0.3.0",
-      "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz",
+      "version": "0.4.0",
+      "from": "redis-mpool@~0.4.0",
       "dependencies": {
         "generic-pool": {
           "version": "2.1.1",
@@ -2741,6 +2740,40 @@
             }
           }
         },
+        "redis-mpool": {
+          "version": "0.3.0",
+          "from": "redis-mpool@~0.3.0",
+          "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz",
+          "dependencies": {
+            "generic-pool": {
+              "version": "2.1.1",
+              "from": "generic-pool@~2.1.1",
+              "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz"
+            },
+            "redis": {
+              "version": "0.12.1",
+              "from": "redis@~0.12.1",
+              "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
+            },
+            "hiredis": {
+              "version": "0.1.17",
+              "from": "hiredis@~0.1.17",
+              "resolved": "https://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz",
+              "dependencies": {
+                "bindings": {
+                  "version": "1.2.1",
+                  "from": "bindings@*",
+                  "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+                },
+                "nan": {
+                  "version": "1.1.2",
+                  "from": "nan@~1.1.0",
+                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
+                }
+              }
+            }
+          }
+        },
         "carto": {
           "version": "0.15.1-cdb1",
           "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
@@ -2866,9 +2899,9 @@
               "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
             },
             "tunnel-agent": {
-              "version": "0.4.0",
+              "version": "0.4.1",
               "from": "tunnel-agent@~0.4.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
             },
             "tough-cookie": {
               "version": "2.0.0",
diff --git a/package.json b/package.json
index 9a68d304..44d2e0de 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
         "cartodb-redis": "~0.13.0",
         "cartodb-psql": "~0.4.0",
         "fastly-purge": "~1.0.0",
-        "redis-mpool": "~0.3.0",
+        "redis-mpool": "~0.4.0",
         "lzma": "~1.3.7",
         "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb"
     },

From bf24347328df808fd170f1110c7a798f88075580 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Sun, 5 Jul 2015 20:59:52 +0200
Subject: [PATCH 10/14] Exposes redis `noReadyCheck` config

---
 NEWS.md             | 5 ++++-
 app.js              | 2 +-
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 5cc28b22..418d5117 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,12 +1,15 @@
 # Changelog
 
-## 2.6.2
+## 2.7.0
 
 Released 2015-mm-dd
 
 Announcements:
  - Upgrades redis-mpool to [0.4.0](https://github.com/CartoDB/node-redis-mpool/releases/tag/0.4.0)
 
+New features:
+ - Exposes redis `noReadyCheck` config
+
 
 ## 2.6.1
 
diff --git a/app.js b/app.js
index 19361566..257ffe0a 100755
--- a/app.js
+++ b/app.js
@@ -65,7 +65,7 @@ if ( global.environment.log_filename ) {
 global.log4js.configure(log4js_config, { cwd: __dirname });
 global.logger = global.log4js.getLogger();
 
-var redisOpts = _.extend(global.environment.redis, { name: 'windshaft' }),
+var redisOpts = _.extend(global.environment.redis, { name: 'windshaft', noReadyCheck: true }),
     redisPool = new RedisPool(redisOpts);
 
 // Include cartodb_windshaft only _after_ the "global" variable is set
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 363bee80..84494142 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index 44d2e0de..57ffc8e5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.6.2",
+    "version": "2.7.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"

From 0da6495330bd8e8b47cf0e05d011e22a64f646d9 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Sun, 5 Jul 2015 21:00:25 +0200
Subject: [PATCH 11/14] Fixes `unwatchOnRelease` redis config

---
 NEWS.md | 3 +++
 app.js  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 418d5117..db575294 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,6 +10,9 @@ Announcements:
 New features:
  - Exposes redis `noReadyCheck` config
 
+Bug fixes:
+ - Fixes `unwatchOnRelease` redis config
+
 
 ## 2.6.1
 
diff --git a/app.js b/app.js
index 257ffe0a..3f35fe47 100755
--- a/app.js
+++ b/app.js
@@ -65,7 +65,7 @@ if ( global.environment.log_filename ) {
 global.log4js.configure(log4js_config, { cwd: __dirname });
 global.logger = global.log4js.getLogger();
 
-var redisOpts = _.extend(global.environment.redis, { name: 'windshaft', noReadyCheck: true }),
+var redisOpts = _.extend(global.environment.redis, { name: 'windshaft', unwatchOnRelease: false, noReadyCheck: true }),
     redisPool = new RedisPool(redisOpts);
 
 // Include cartodb_windshaft only _after_ the "global" variable is set

From 27ff1ac4f6cd92a9eb10b0265a506b707b456bc9 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Sun, 5 Jul 2015 21:16:12 +0200
Subject: [PATCH 12/14] Upgrades windshaft to 0.47.0

---
 NEWS.md             |  1 +
 npm-shrinkwrap.json | 79 +++------------------------------------------
 package.json        |  2 +-
 3 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index db575294..c3216c6e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,7 @@
 Released 2015-mm-dd
 
 Announcements:
+ - Upgrades windshaft to [0.47.0](https://github.com/CartoDB/Windshaft/releases/tag/0.47.0)
  - Upgrades redis-mpool to [0.4.0](https://github.com/CartoDB/node-redis-mpool/releases/tag/0.4.0)
 
 New features:
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 84494142..a2d734e2 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -485,9 +485,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.46.1",
-      "from": "windshaft@0.46.1",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.46.1.tgz",
+      "version": "0.47.0",
+      "from": "windshaft@0.47.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.47.0.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -495,44 +495,9 @@
           "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d"
         },
         "grainstore": {
-          "version": "0.23.0",
-          "from": "grainstore@~0.23.0",
-          "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-0.23.0.tgz",
+          "version": "1.0.0",
+          "from": "grainstore@~1.0.0",
           "dependencies": {
-            "redis-mpool": {
-              "version": "0.1.0",
-              "from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
-              "resolved": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
-              "dependencies": {
-                "generic-pool": {
-                  "version": "2.1.1",
-                  "from": "generic-pool@~2.1.1",
-                  "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz"
-                },
-                "redis": {
-                  "version": "0.12.1",
-                  "from": "redis@~0.12.1",
-                  "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
-                },
-                "hiredis": {
-                  "version": "0.1.17",
-                  "from": "hiredis@~0.1.17",
-                  "resolved": "https://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz",
-                  "dependencies": {
-                    "bindings": {
-                      "version": "1.2.1",
-                      "from": "bindings@*",
-                      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
-                    },
-                    "nan": {
-                      "version": "1.1.2",
-                      "from": "nan@~1.1.0",
-                      "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
-                    }
-                  }
-                }
-              }
-            },
             "carto": {
               "version": "0.9.5-cdb2",
               "from": "https://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
@@ -2740,40 +2705,6 @@
             }
           }
         },
-        "redis-mpool": {
-          "version": "0.3.0",
-          "from": "redis-mpool@~0.3.0",
-          "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz",
-          "dependencies": {
-            "generic-pool": {
-              "version": "2.1.1",
-              "from": "generic-pool@~2.1.1",
-              "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz"
-            },
-            "redis": {
-              "version": "0.12.1",
-              "from": "redis@~0.12.1",
-              "resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
-            },
-            "hiredis": {
-              "version": "0.1.17",
-              "from": "hiredis@~0.1.17",
-              "resolved": "https://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz",
-              "dependencies": {
-                "bindings": {
-                  "version": "1.2.1",
-                  "from": "bindings@*",
-                  "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
-                },
-                "nan": {
-                  "version": "1.1.2",
-                  "from": "nan@~1.1.0",
-                  "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
-                }
-              }
-            }
-          }
-        },
         "carto": {
           "version": "0.15.1-cdb1",
           "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
diff --git a/package.json b/package.json
index 57ffc8e5..a3ac6a02 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.46.1",
+        "windshaft": "0.47.0",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",

From cd65c6dd0e0ed3b6ccf44d3d2682a712b4cc763b Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 6 Jul 2015 01:05:28 +0200
Subject: [PATCH 13/14] Release 2.7.0

---
 NEWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index c3216c6e..2f3cbe57 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 ## 2.7.0
 
-Released 2015-mm-dd
+Released 2015-07-03
 
 Announcements:
  - Upgrades windshaft to [0.47.0](https://github.com/CartoDB/Windshaft/releases/tag/0.47.0)

From 19f488095b112f72b9dede5e9b649fe0c5bed9fd Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 6 Jul 2015 01:07:30 +0200
Subject: [PATCH 14/14] Stubs next version

---
 NEWS.md             | 6 ++++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 2f3cbe57..af0e9abc 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.7.1
+
+Released 2015-mm-dd
+
+
+
 ## 2.7.0
 
 Released 2015-07-03
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a2d734e2..61287032 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
diff --git a/package.json b/package.json
index a3ac6a02..8f3417fc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.7.0",
+    "version": "2.7.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"