From 7a5928d9572408cd2424287406b6fd1c0872f53d Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 15 Jul 2015 11:31:26 +0200 Subject: [PATCH 1/3] Upgrades windshaft to 0.48.0 --- NEWS.md | 5 ++++- npm-shrinkwrap.json | 38 +++++++++++++++++++------------------- package.json | 4 ++-- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/NEWS.md b/NEWS.md index fd371c71..2f4c5171 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,12 @@ # Changelog -## 2.7.3 +## 2.8.0 Released 2015-mm-dd +Announcements: + - Upgrades windshaft to [0.48.0](https://github.com/CartoDB/Windshaft/releases/tag/0.48.0) + ## 2.7.2 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 629e1dd2..0e18c3c5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.7.3", + "version": "2.8.0", "dependencies": { "cartodb-psql": { "version": "0.4.0", @@ -139,14 +139,14 @@ "resolved": "https://registry.npmjs.org/async/-/async-1.3.0.tgz" }, "mime-types": { - "version": "2.1.2", + "version": "2.1.3", "from": "mime-types@^2.1.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.3.tgz", "dependencies": { "mime-db": { - "version": "1.14.0", - "from": "mime-db@~1.14.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz" + "version": "1.15.0", + "from": "mime-db@~1.15.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz" } } } @@ -276,9 +276,9 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz", "dependencies": { "bluebird": { - "version": "2.9.32", + "version": "2.9.33", "from": "bluebird@^2.9.30", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.32.tgz" + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.33.tgz" }, "chalk": { "version": "1.1.0", @@ -485,9 +485,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.47.0", - "from": "windshaft@0.47.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.47.0.tgz", + "version": "0.48.0", + "from": "windshaft@0.48.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.48.0.tgz", "dependencies": { "chronograph": { "version": "0.1.0", @@ -2293,8 +2293,8 @@ }, "tilelive-mapnik": { "version": "0.6.15", - "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", - "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", + "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/upgrade-mapnik", + "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/upgrade-mapnik", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -2303,15 +2303,15 @@ }, "mime": { "version": "1.2.11", - "from": "mime@~1.2.9", + "from": "mime@~1.2.11", "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" } } }, "mapnik": { - "version": "1.4.15-cdb1", - "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1", - "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1", + "version": "1.4.15-cdb2", + "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2", + "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2", "dependencies": { "nan": { "version": "1.2.0", @@ -2919,8 +2919,8 @@ }, "abaculus": { "version": "1.1.0", - "from": "https://github.com/CartoDB/abaculus/tarball/cdb", - "resolved": "https://github.com/CartoDB/abaculus/tarball/cdb" + "from": "https://github.com/CartoDB/abaculus/tarball/upgrade-mapnik", + "resolved": "https://github.com/CartoDB/abaculus/tarball/upgrade-mapnik" }, "sphericalmercator": { "version": "1.0.2", diff --git a/package.json b/package.json index e4cb2b75..cfa4bec9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.7.3", + "version": "2.8.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.47.0", + "windshaft": "0.48.0", "step": "~0.0.5", "queue-async": "~1.0.7", "request": "~2.9.203", From f6c47bf85e2ddeac3437f79a1fead140e6b361b9 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 15 Jul 2015 11:43:54 +0200 Subject: [PATCH 2/3] Release 2.8.0 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 2f4c5171..80f4f0a1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.8.0 -Released 2015-mm-dd +Released 2015-07-15 Announcements: - Upgrades windshaft to [0.48.0](https://github.com/CartoDB/Windshaft/releases/tag/0.48.0) From decd9077e4b9b1105bc43784ad0faafbac8e6d14 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 15 Jul 2015 11:44:59 +0200 Subject: [PATCH 3/3] 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 80f4f0a1..5b6aa143 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Changelog +## 2.8.1 + +Released 2015-mm-dd + + ## 2.8.0 Released 2015-07-15 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 0e18c3c5..f6a2263b 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.8.0", + "version": "2.8.1", "dependencies": { "cartodb-psql": { "version": "0.4.0", diff --git a/package.json b/package.json index cfa4bec9..2c3423c8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.8.0", + "version": "2.8.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"