From 362d48ab812b4f83544408ce2646076425778f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 19 Mar 2019 18:34:11 +0100 Subject: [PATCH 1/2] Upgrade windshaft to version 4.13.5 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index af0db023..d3616e4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3922,8 +3922,8 @@ } }, "tilelive-mapnik": { - "version": "github:cartodb/tilelive-mapnik#b5f37585a0a9d4e98bdbdcbbd083df24e64bfd7a", - "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb19", + "version": "github:cartodb/tilelive-mapnik#3f2021f6c5fd720bf09114ed4e012579564723c0", + "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb20", "requires": { "@carto/mapnik": "3.6.2-carto.11", "generic-pool": "^3.6.1", @@ -4139,9 +4139,9 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "4.13.4", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.4.tgz", - "integrity": "sha512-9PI06KMC6SBaQX0FLlOmWk9HtKvPa6t09RdVwWJojEnDmmMtzzw1Rvw5gCp8h5DIcgs65fT6cU/gWAZRL+lOQQ==", + "version": "4.13.5", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.5.tgz", + "integrity": "sha512-e4ZG+ofpuk74hASiqRTD6OqsNpziiXWzr8V5ZAGzcR3ErmlvaM4rEqLplI7AZ9Y3Hx5KUW0H7veCfxf1vhHQEg==", "requires": { "@carto/mapnik": "3.6.2-carto.11", "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9", @@ -4158,7 +4158,7 @@ "semver": "5.5.0", "sphericalmercator": "1.0.5", "tilelive": "5.12.3", - "tilelive-mapnik": "github:cartodb/tilelive-mapnik#b5f37585a0a9d4e98bdbdcbbd083df24e64bfd7a", + "tilelive-mapnik": "github:cartodb/tilelive-mapnik#3f2021f6c5fd720bf09114ed4e012579564723c0", "torque.js": "2.17.1", "underscore": "1.6.0" } diff --git a/package.json b/package.json index eb3eb717..b6a87350 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "4.13.4", + "windshaft": "4.13.5", "yargs": "11.1.0" }, "devDependencies": { From 2f838f0b6a00a20496b5f2bfac5116b1d0a6b3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 19 Mar 2019 18:39:56 +0100 Subject: [PATCH 2/2] Update NEWS --- NEWS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index fe902920..f690de2d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,8 +8,8 @@ Announcements: - Numeric histogram performance improvement (#1080) - Fix boolean aggregation layer option not working when numbers of rows are above the threshold (#1082) - Update deps: - - windshaft@4.13.4: - - Upgrade `tilelive-mapnik` to version `0.6.18-cdb19` + - windshaft@4.13.5: + - Upgrade `tilelive-mapnik` to version `0.6.18-cdb20` - Upgrade `@carto/tilelive-bridge` to version `2.5.1-cdb12` - Upgrade `grainstore` to version `1.11.0`, do not hang when child process is not able to generate a Mapnik XML