From e82131f4e8c5c0055cf974049ba8cdadda9dde06 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 6 Mar 2015 10:45:01 +0100 Subject: [PATCH 1/2] Upgrades windshaft@0.39.0 --- NEWS.md | 4 +++- npm-shrinkwrap.json | 40 +++++++++++++++++++++------------------- package.json | 2 +- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/NEWS.md b/NEWS.md index 45797c48..7e927208 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,8 @@ 1.29.0 -- 2015-mm-dd -------------------- -- Upgrades windshaft to [0.38.2](https://github.com/CartoDB/Windshaft/releases/tag/0.38.2) + +Announcements: + - Upgrades windshaft to [0.39.0](https://github.com/CartoDB/Windshaft/releases/tag/0.39.0) 1.28.5 -- 2015-02-20 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 64fbd6ad..a487deb5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -5,7 +5,7 @@ "cartodb-psql": { "version": "0.4.0", "from": "cartodb-psql@~0.4.0", - "resolved": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0", + "resolved": "https://registry.npmjs.org/cartodb-psql/-/cartodb-psql-0.4.0.tgz", "dependencies": { "pg": { "version": "2.6.2-cdb1", @@ -87,7 +87,8 @@ }, "isarray": { "version": "0.0.1", - "from": "isarray@0.0.1" + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", @@ -119,7 +120,7 @@ "redis-mpool": { "version": "0.3.0", "from": "redis-mpool@~0.3.0", - "resolved": "https://github.com/CartoDB/node-redis-mpool/tarball/0.3.0", + "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -157,9 +158,9 @@ "resolved": "https://registry.npmjs.org/rollbar/-/rollbar-0.3.13.tgz", "dependencies": { "node-uuid": { - "version": "1.4.2", + "version": "1.4.3", "from": "node-uuid@1.4.x", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz" + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz" }, "lru-cache": { "version": "2.2.4", @@ -181,8 +182,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.38.2", - "from": "windshaft@~0.38.2", + "version": "0.39.0", + "from": "https://github.com/CartoDB/Windshaft/tarball/292-torque-buffer-size", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/292-torque-buffer-size", "dependencies": { "chronograph": { "version": "0.1.0", @@ -294,9 +296,9 @@ "from": "forever-agent@~0.5.0" }, "node-uuid": { - "version": "1.4.2", + "version": "1.4.3", "from": "node-uuid@~1.4.0", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz" + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz" }, "tough-cookie": { "version": "0.12.1", @@ -1710,9 +1712,9 @@ } }, "tilelive-mapnik": { - "version": "0.6.12", - "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", - "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", + "version": "0.6.15", + "from": "tilelive-mapnik@0.6.15", + "resolved": "https://registry.npmjs.org/tilelive-mapnik/-/tilelive-mapnik-0.6.15.tgz", "dependencies": { "generic-pool": { "version": "2.1.1", @@ -2112,7 +2114,7 @@ "canvas": { "version": "1.2.1", "from": "canvas@1.2.1", - "resolved": "https://github.com/Automattic/node-canvas/tarball/master", + "resolved": "https://registry.npmjs.org/canvas/-/canvas-1.2.1.tgz", "dependencies": { "nan": { "version": "1.5.3", @@ -2155,9 +2157,8 @@ "resolved": "git://github.com/CartoDB/node-step-profiler.git#9b97881e450445bd8a307a9cc372b5129cb4529a" }, "torque.js": { - "version": "2.10.0", - "from": "https://github.com/CartoDB/torque/tarball/2.10.0", - "resolved": "https://github.com/CartoDB/torque/tarball/2.10.0" + "version": "2.11.0", + "from": "torque.js@~2.11.0" }, "request": { "version": "2.48.0", @@ -2180,7 +2181,8 @@ }, "isarray": { "version": "0.0.1", - "from": "isarray@0.0.1" + "from": "isarray@0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", @@ -2229,9 +2231,9 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz" }, "node-uuid": { - "version": "1.4.2", + "version": "1.4.3", "from": "node-uuid@~1.4.0", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz" + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz" }, "qs": { "version": "2.3.3", diff --git a/package.json b/package.json index 68b69f6b..5568509c 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "~0.38.2", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/292-torque-buffer-size", "step": "~0.0.5", "queue-async": "~1.0.7", "request": "~2.9.203", From cfe434c8ed036db99b4c8762edeea17c5348e37e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 9 Mar 2015 13:52:47 +0100 Subject: [PATCH 2/2] Use published version --- npm-shrinkwrap.json | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a487deb5..a6e75bf0 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -96,7 +96,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@2" + "from": "inherits@~2.0.1" } } } @@ -183,8 +183,7 @@ }, "windshaft": { "version": "0.39.0", - "from": "https://github.com/CartoDB/Windshaft/tarball/292-torque-buffer-size", - "resolved": "https://github.com/CartoDB/Windshaft/tarball/292-torque-buffer-size", + "from": "windshaft@~0.39.0", "dependencies": { "chronograph": { "version": "0.1.0", diff --git a/package.json b/package.json index 5568509c..276693a3 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "https://github.com/CartoDB/Windshaft/tarball/292-torque-buffer-size", + "windshaft": "~0.39.0", "step": "~0.0.5", "queue-async": "~1.0.7", "request": "~2.9.203",