From 3fa4f8573e471bbf588f33bd431e6b3c5735e16d Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 28 Oct 2015 16:31:11 +0100 Subject: [PATCH 1/5] Upgrades windshaft to 1.3.0 --- NEWS.md | 5 +++- npm-shrinkwrap.json | 60 ++++++++++++++++++++++----------------------- package.json | 4 +-- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/NEWS.md b/NEWS.md index a603b02c..7a1bf41d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,12 @@ # Changelog -## 2.16.1 +## 2.17.0 Released 2015-mm-dd +Announcements: + - Upgrades windshaft to [1.3.0](https://github.com/CartoDB/Windshaft/releases/tag/1.3.0) + ## 2.16.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 89c5e1ad..41a95934 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.16.1", + "version": "2.17.0", "dependencies": { "body-parser": { "version": "1.14.1", @@ -58,7 +58,7 @@ }, "qs": { "version": "5.1.0", - "from": "qs@5.1.0", + "from": "qs@~5.1.0", "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz" }, "raw-body": { @@ -68,14 +68,14 @@ "dependencies": { "unpipe": { "version": "1.0.0", - "from": "unpipe@1.0.0", + "from": "unpipe@~1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" } } }, "type-is": { "version": "1.6.9", - "from": "type-is@~1.6.9", + "from": "type-is@~1.6.6", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.9.tgz", "dependencies": { "media-typer": { @@ -522,9 +522,9 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.0.tgz", "dependencies": { "readable-stream": { - "version": "2.0.2", + "version": "2.0.3", "from": "readable-stream@~2.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.3.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", @@ -581,9 +581,9 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz", "dependencies": { "async": { - "version": "1.4.2", + "version": "1.5.0", "from": "async@^1.4.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.4.2.tgz" + "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz" } } }, @@ -594,7 +594,7 @@ }, "mime-types": { "version": "2.1.7", - "from": "mime-types@~2.1.6", + "from": "mime-types@~2.1.7", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz", "dependencies": { "mime-db": { @@ -662,9 +662,9 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz" }, "boom": { - "version": "2.9.0", + "version": "2.10.0", "from": "boom@^2.8.x", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.9.0.tgz" + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.0.tgz" }, "cryptiles": { "version": "2.0.5", @@ -684,9 +684,9 @@ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz" }, "stringstream": { - "version": "0.0.4", + "version": "0.0.5", "from": "stringstream@~0.0.4", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz" + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz" }, "combined-stream": { "version": "1.0.5", @@ -827,13 +827,13 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.2.0", - "from": "windshaft@~1.2.0", + "version": "1.3.0", + "from": "windshaft@~1.3.0", "dependencies": { "mapnik": { - "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", + "version": "1.4.15-cdb3", + "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb3", + "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb3", "dependencies": { "nan": { "version": "1.2.0", @@ -2999,9 +2999,9 @@ } }, "tilelive-mapnik": { - "version": "0.6.15", - "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1", - "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.x-cdb1", + "version": "0.6.15-cdb1", + "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb1", + "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb1", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -3016,14 +3016,14 @@ } }, "tilelive-bridge": { - "version": "1.3.0", - "from": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option", - "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/gzip-option", + "version": "1.3.0-cdb1", + "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb1", + "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb1", "dependencies": { "mapnik-pool": { - "version": "0.1.1", - "from": "https://github.com/CartoDB/mapnik-pool/tarball/cdb", - "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/cdb", + "version": "0.1.1-cdb1", + "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb1", + "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb1", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -3109,9 +3109,9 @@ "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz" }, "abaculus": { - "version": "1.1.0", - "from": "https://github.com/CartoDB/abaculus/tarball/cdb", - "resolved": "https://github.com/CartoDB/abaculus/tarball/cdb" + "version": "1.1.0-cdb1", + "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb1", + "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb1" }, "sphericalmercator": { "version": "1.0.3", diff --git a/package.json b/package.json index e74669b4..87ecf331 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.16.1", + "version": "2.17.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -29,7 +29,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "~1.2.0", + "windshaft": "~1.3.0", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From 34e866007ed43e56f6fb9f505c8582d0ed0b5f09 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 28 Oct 2015 19:15:26 +0100 Subject: [PATCH 2/5] Use windshaft 1.4.0 --- NEWS.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 7a1bf41d..54091972 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,7 +5,7 @@ Released 2015-mm-dd Announcements: - - Upgrades windshaft to [1.3.0](https://github.com/CartoDB/Windshaft/releases/tag/1.3.0) + - Upgrades windshaft to [1.4.0](https://github.com/CartoDB/Windshaft/releases/tag/1.4.0) ## 2.16.0 diff --git a/package.json b/package.json index 87ecf331..dfde0fa5 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "~1.3.0", + "windshaft": "~1.4.0", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From ee39450864d540850ced5431a6abed3b0109b8c4 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 28 Oct 2015 19:21:22 +0100 Subject: [PATCH 3/5] Regenerate npm-shrinkwrap.json --- npm-shrinkwrap.json | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 41a95934..16d9f155 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -58,7 +58,7 @@ }, "qs": { "version": "5.1.0", - "from": "qs@~5.1.0", + "from": "qs@5.1.0", "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz" }, "raw-body": { @@ -68,14 +68,14 @@ "dependencies": { "unpipe": { "version": "1.0.0", - "from": "unpipe@~1.0.0", + "from": "unpipe@1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" } } }, "type-is": { "version": "1.6.9", - "from": "type-is@~1.6.6", + "from": "type-is@~1.6.9", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.9.tgz", "dependencies": { "media-typer": { @@ -441,7 +441,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@2", + "from": "inherits@~2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -533,7 +533,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.1", + "from": "inherits@2", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { @@ -594,7 +594,7 @@ }, "mime-types": { "version": "2.1.7", - "from": "mime-types@~2.1.7", + "from": "mime-types@2.1.7", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.7.tgz", "dependencies": { "mime-db": { @@ -827,13 +827,13 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.3.0", - "from": "windshaft@~1.3.0", + "version": "1.4.0", + "from": "windshaft@~1.4.0", "dependencies": { "mapnik": { - "version": "1.4.15-cdb3", - "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb3", - "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb3", + "version": "1.4.15-cdb4", + "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb4", + "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb4", "dependencies": { "nan": { "version": "1.2.0", @@ -2999,9 +2999,9 @@ } }, "tilelive-mapnik": { - "version": "0.6.15-cdb1", - "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb1", - "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb1", + "version": "0.6.15-cdb2", + "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb2", + "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb2", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -3016,14 +3016,14 @@ } }, "tilelive-bridge": { - "version": "1.3.0-cdb1", - "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb1", - "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb1", + "version": "1.3.0-cdb2", + "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb2", + "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb2", "dependencies": { "mapnik-pool": { - "version": "0.1.1-cdb1", - "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb1", - "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb1", + "version": "0.1.1-cdb2", + "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb2", + "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb2", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -3109,9 +3109,9 @@ "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.11.0.tgz" }, "abaculus": { - "version": "1.1.0-cdb1", - "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb1", - "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb1" + "version": "1.1.0-cdb2", + "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb2", + "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb2" }, "sphericalmercator": { "version": "1.0.3", From 628b1921b4eb18e4dfe94d6aeb1527facd750031 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 28 Oct 2015 19:27:03 +0100 Subject: [PATCH 4/5] Release 2.17.0 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 54091972..63a04019 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.17.0 -Released 2015-mm-dd +Released 2015-10-28 Announcements: - Upgrades windshaft to [1.4.0](https://github.com/CartoDB/Windshaft/releases/tag/1.4.0) From a20a1f692b678486af05930433186ef3bbb69da3 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 28 Oct 2015 19:27:53 +0100 Subject: [PATCH 5/5] 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 63a04019..4913a33c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Changelog +## 2.17.1 + +Released 2015-mm-dd + + ## 2.17.0 Released 2015-10-28 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 16d9f155..aab02ff8 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.17.0", + "version": "2.17.1", "dependencies": { "body-parser": { "version": "1.14.1", diff --git a/package.json b/package.json index dfde0fa5..70fbb80d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.17.0", + "version": "2.17.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"