From ee7917676bb4021bdf8f5b13cd8c773e40866810 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Thu, 8 Feb 2018 17:00:13 +0100 Subject: [PATCH 1/4] Update camshaft to 0.61.2 This is to fixe a bug in the line-sequential analyses (length was incorrect) --- package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index e71f7d8d..fd961a84 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ ], "dependencies": { "body-parser": "^1.18.2", - "camshaft": "0.60.0", + "camshaft": "0.61.2", "cartodb-psql": "0.10.2", "cartodb-query-tables": "0.3.0", "cartodb-redis": "0.15.0", diff --git a/yarn.lock b/yarn.lock index 8499231c..2fe6f1b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,7 +11,7 @@ node-pre-gyp "~0.6.30" protozero "1.5.1" -"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb1": +"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb1": version "2.5.1-cdb1" resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/b0b5559f948e77b337bc9a9ae0bf6ec4249fba21" dependencies: @@ -23,7 +23,7 @@ version "1.0.5" resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2" -"abaculus@github:cartodb/abaculus#2.0.3-cdb2": +abaculus@cartodb/abaculus#2.0.3-cdb2: version "2.0.3-cdb2" resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/6468e0e3fddb2b23f60b9a3156117cff0307f6dc" dependencies: @@ -232,9 +232,9 @@ camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" -camshaft@0.60.0: - version "0.60.0" - resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.60.0.tgz#0433b5a576e08cabbc9bae1e1b22305274b8b7b6" +camshaft@0.61.2: + version "0.61.2" + resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.61.2.tgz#5c0d43ca769377c6cfb9808f1023d20ea3df55b3" dependencies: async "^1.5.2" bunyan "1.8.1" @@ -243,7 +243,7 @@ camshaft@0.60.0: 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: @@ -269,7 +269,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: @@ -2206,7 +2206,7 @@ through@2: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb5": +tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb5: version "0.6.18-cdb5" resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cec846025e60837c60af193d600d972917ea8d35" dependencies: From ac6f0e1c679a8e718cd8b114ddfc12333dab95a0 Mon Sep 17 00:00:00 2001 From: Raul Marin Date: Mon, 12 Feb 2018 11:15:31 +0100 Subject: [PATCH 2/4] Update Windshaft to 4.5.1 --- NEWS.md | 2 +- package.json | 2 +- yarn.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index fae3862a..68c534d5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,7 +3,7 @@ ## 5.3.0 Released 2018-mm-dd - Upgrades redis-mpool to 0.5.0 - - Upgrades windshaft to 4.5.0 + - Upgrades windshaft to 4.5.1 - Upgrades cartodb-redis to 0.15.0 - Adds metrics option to the Mapnik renderer diff --git a/package.json b/package.json index e71f7d8d..0bf665da 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.20.2", "underscore": "~1.6.0", - "windshaft": "4.5.0", + "windshaft": "4.5.1", "yargs": "~5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 8499231c..dbfdc908 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2367,9 +2367,9 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -windshaft@4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.0.tgz#44f17073267d459c9a2b9f213250210b89d4d35d" +windshaft@4.5.1: + version "4.5.1" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.1.tgz#1be73b2d81cd8df648423ac219dae27406261aab" dependencies: "@carto/mapnik" "3.6.2-carto.2" "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1 From abf33a1c6882ec921af042457414a384605a0d92 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Mon, 12 Feb 2018 12:03:02 +0100 Subject: [PATCH 3/4] Release 5.3.0 --- NEWS.md | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 68c534d5..9c9c0c9e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,11 +1,12 @@ # Changelog ## 5.3.0 -Released 2018-mm-dd +Released 2018-02-12 - Upgrades redis-mpool to 0.5.0 - Upgrades windshaft to 4.5.1 - Upgrades cartodb-redis to 0.15.0 - Adds metrics option to the Mapnik renderer + - Upgrades camshadft to 0.61.2 ## 5.2.1 Released 2018-02-01 diff --git a/package.json b/package.json index 68bc6c7f..371ccfa9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "5.2.2", + "version": "5.3.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From 3539b658fb79fcccec5594ef2abe548672baaef2 Mon Sep 17 00:00:00 2001 From: Raul Marin Date: Mon, 12 Feb 2018 12:13:29 +0100 Subject: [PATCH 4/4] Update Windshaft to 4.5.2 --- NEWS.md | 2 +- package.json | 2 +- yarn.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index 9c9c0c9e..e03a601f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,7 +3,7 @@ ## 5.3.0 Released 2018-02-12 - Upgrades redis-mpool to 0.5.0 - - Upgrades windshaft to 4.5.1 + - Upgrades windshaft to 4.5.2 - Upgrades cartodb-redis to 0.15.0 - Adds metrics option to the Mapnik renderer - Upgrades camshadft to 0.61.2 diff --git a/package.json b/package.json index 371ccfa9..8e3d6917 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.20.2", "underscore": "~1.6.0", - "windshaft": "4.5.1", + "windshaft": "4.5.2", "yargs": "~5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 29c0f15f..ca67ed6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2367,9 +2367,9 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -windshaft@4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.1.tgz#1be73b2d81cd8df648423ac219dae27406261aab" +windshaft@4.5.2: + version "4.5.2" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.2.tgz#d371af414fc4fbf98bd0f1aaabed91aa43224567" dependencies: "@carto/mapnik" "3.6.2-carto.2" "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1