From f41af41bd497ddf5e1735a3b531b5767bd80493b Mon Sep 17 00:00:00 2001
From: Mario de Frutos <ethervoid@gmail.com>
Date: Wed, 29 Nov 2017 16:32:22 +0100
Subject: [PATCH 1/2] Update to turbo-carto 0.20.2 (#805)

---
 NEWS.md      |  6 ++++++
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 409b5ebc..7748be37 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.1.1
+Released 2017-mm-dd
+
+Announcements:
+ - Upgrades turbo-carto to [0.20.2](https://github.com/CartoDB/turbo-carto/releases/tag/0.20.2).
+
 ## 4.1.0
 Released 2017-mm-dd
 
diff --git a/package.json b/package.json
index 8e4c1d84..43efe416 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "semver": "~5.3.0",
     "step": "~0.0.6",
     "step-profiler": "~0.3.0",
-    "turbo-carto": "0.20.1",
+    "turbo-carto": "0.20.2",
     "underscore": "~1.6.0",
     "windshaft": "4.0.1",
     "yargs": "~5.0.0"
diff --git a/yarn.lock b/yarn.lock
index 7b5394aa..7312213c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"abaculus@github:cartodb/abaculus#2.0.3-cdb1":
+abaculus@cartodb/abaculus#2.0.3-cdb1:
   version "2.0.3-cdb1"
   resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/f5f34e1c80cdd8d49edd1d6fe3b2220ab2e23aaf"
   dependencies:
@@ -222,7 +222,7 @@ camshaft@0.59.4:
     dot "^1.0.3"
     request "^2.69.0"
 
-"canvas@github:cartodb/node-canvas#1.6.2-cdb2":
+canvas@cartodb/node-canvas#1.6.2-cdb2:
   version "1.6.2-cdb2"
   resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766"
   dependencies:
@@ -248,7 +248,7 @@ carto@CartoDB/carto#0.15.1-cdb1:
     optimist "~0.6.0"
     underscore "~1.6.0"
 
-"carto@github:cartodb/carto#0.15.1-cdb3":
+carto@cartodb/carto#0.15.1-cdb3:
   version "0.15.1-cdb3"
   resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7"
   dependencies:
@@ -2145,7 +2145,7 @@ through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-"tilelive-bridge@github:cartodb/tilelive-bridge#2.3.1-cdb4":
+tilelive-bridge@cartodb/tilelive-bridge#2.3.1-cdb4:
   version "2.3.1-cdb4"
   resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/faa2b638da2d119b78281575d40255cb523f6ca6"
   dependencies:
@@ -2153,7 +2153,7 @@ through@2:
     mapnik-pool "~0.1.3"
     sphericalmercator "1.0.x"
 
-"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb3":
+tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb3:
   version "0.6.18-cdb3"
   resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/23bd1c31dd57d0b76c86b9f1eaf62462b3c17d01"
   dependencies:
@@ -2190,9 +2190,9 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-turbo-carto@0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/turbo-carto/-/turbo-carto-0.20.1.tgz#e9f5fa1408d9d4325a1e79333e6d242170f89e6d"
+turbo-carto@0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/turbo-carto/-/turbo-carto-0.20.2.tgz#2b737597a65c2918432f70ea414f12fbec2b6a6f"
   dependencies:
     cartocolor "4.0.0"
     colorbrewer "1.0.0"

From a20e789302cf997282f773c71662ae692c02bf15 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <ethervoid@gmail.com>
Date: Wed, 29 Nov 2017 16:34:48 +0100
Subject: [PATCH 2/2] Release 4.1.1

---
 NEWS.md      | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 7748be37..e38e1db6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,7 +1,7 @@
 # Changelog
 
 ## 4.1.1
-Released 2017-mm-dd
+Released 2017-11-29
 
 Announcements:
  - Upgrades turbo-carto to [0.20.2](https://github.com/CartoDB/turbo-carto/releases/tag/0.20.2).
diff --git a/package.json b/package.json
index 43efe416..75de7f0b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "4.0.2",
+  "version": "4.1.1",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"