Merge remote-tracking branch 'origin/master' into perf-boost-agg-dataview

This commit is contained in:
Rafa de la Torre 2018-02-12 19:33:35 +01:00
commit d0a8bd428f
3 changed files with 17 additions and 16 deletions

View File

@ -1,11 +1,12 @@
# Changelog # Changelog
## 5.3.0 ## 5.3.0
Released 2018-mm-dd Released 2018-02-12
- Upgrades redis-mpool to 0.5.0 - Upgrades redis-mpool to 0.5.0
- Upgrades windshaft to 4.5.0 - Upgrades windshaft to 4.5.2
- Upgrades cartodb-redis to 0.15.0 - Upgrades cartodb-redis to 0.15.0
- Adds metrics option to the Mapnik renderer - Adds metrics option to the Mapnik renderer
- Upgrades camshadft to 0.61.2
## 5.2.1 ## 5.2.1
Released 2018-02-01 Released 2018-02-01

View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "5.2.2", "version": "5.3.0",
"description": "A map tile server for CartoDB", "description": "A map tile server for CartoDB",
"keywords": [ "keywords": [
"cartodb" "cartodb"
@ -25,7 +25,7 @@
], ],
"dependencies": { "dependencies": {
"body-parser": "^1.18.2", "body-parser": "^1.18.2",
"camshaft": "0.60.0", "camshaft": "0.61.2",
"cartodb-psql": "0.10.2", "cartodb-psql": "0.10.2",
"cartodb-query-tables": "0.3.0", "cartodb-query-tables": "0.3.0",
"cartodb-redis": "0.15.0", "cartodb-redis": "0.15.0",
@ -47,7 +47,7 @@
"step-profiler": "~0.3.0", "step-profiler": "~0.3.0",
"turbo-carto": "0.20.2", "turbo-carto": "0.20.2",
"underscore": "~1.6.0", "underscore": "~1.6.0",
"windshaft": "4.5.0", "windshaft": "4.5.2",
"yargs": "~5.0.0" "yargs": "~5.0.0"
}, },
"devDependencies": { "devDependencies": {

View File

@ -11,7 +11,7 @@
node-pre-gyp "~0.6.30" node-pre-gyp "~0.6.30"
protozero "1.5.1" 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" version "2.5.1-cdb1"
resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/b0b5559f948e77b337bc9a9ae0bf6ec4249fba21" resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/b0b5559f948e77b337bc9a9ae0bf6ec4249fba21"
dependencies: dependencies:
@ -23,7 +23,7 @@
version "1.0.5" version "1.0.5"
resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2" 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" version "2.0.3-cdb2"
resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/6468e0e3fddb2b23f60b9a3156117cff0307f6dc" resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/6468e0e3fddb2b23f60b9a3156117cff0307f6dc"
dependencies: dependencies:
@ -232,9 +232,9 @@ camelcase@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
camshaft@0.60.0: camshaft@0.61.2:
version "0.60.0" version "0.61.2"
resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.60.0.tgz#0433b5a576e08cabbc9bae1e1b22305274b8b7b6" resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.61.2.tgz#5c0d43ca769377c6cfb9808f1023d20ea3df55b3"
dependencies: dependencies:
async "^1.5.2" async "^1.5.2"
bunyan "1.8.1" bunyan "1.8.1"
@ -243,7 +243,7 @@ camshaft@0.60.0:
dot "^1.0.3" dot "^1.0.3"
request "^2.69.0" 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" version "1.6.2-cdb2"
resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766" resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766"
dependencies: dependencies:
@ -269,7 +269,7 @@ carto@CartoDB/carto#0.15.1-cdb1:
optimist "~0.6.0" optimist "~0.6.0"
underscore "~1.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" version "0.15.1-cdb3"
resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7"
dependencies: dependencies:
@ -2206,7 +2206,7 @@ through@2:
version "2.3.8" version "2.3.8"
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" 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" version "0.6.18-cdb5"
resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cec846025e60837c60af193d600d972917ea8d35" resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cec846025e60837c60af193d600d972917ea8d35"
dependencies: dependencies:
@ -2367,9 +2367,9 @@ window-size@^0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
windshaft@4.5.0: windshaft@4.5.2:
version "4.5.0" version "4.5.2"
resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.0.tgz#44f17073267d459c9a2b9f213250210b89d4d35d" resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.2.tgz#d371af414fc4fbf98bd0f1aaabed91aa43224567"
dependencies: dependencies:
"@carto/mapnik" "3.6.2-carto.2" "@carto/mapnik" "3.6.2-carto.2"
"@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1 "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1