From eae1fbff8adcc6328abef8cea40214f495e8b959 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 10 Dec 2014 20:25:27 +0100 Subject: [PATCH 1/6] Upgrades windshaft --- NEWS.md | 2 +- npm-shrinkwrap.json | 129 ++++++++++++++++---------------------------- package.json | 2 +- 3 files changed, 48 insertions(+), 85 deletions(-) diff --git a/NEWS.md b/NEWS.md index e85e78d9..eddc88a7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -------------------- Announcements: - - Upgrades windshaft to 0.32.1 + - Upgrades windshaft to upgrade-mapnik branch Bugfixes: - Closes fd for log files on `kill -HUP` (#230) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 76bc76f1..8e7d6d09 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -52,8 +52,7 @@ }, "nan": { "version": "1.1.2", - "from": "nan@~1.1.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" + "from": "nan@~1.1.0" } } } @@ -62,8 +61,9 @@ } }, "dot": { - "version": "1.0.2", - "from": "dot@~1.0.2" + "version": "1.0.3", + "from": "dot@~1.0.2", + "resolved": "https://registry.npmjs.org/dot/-/dot-1.0.3.tgz" }, "log4js": { "version": "0.6.21", @@ -82,7 +82,8 @@ "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@~1.0.0" + "from": "core-util-is@~1.0.0", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" }, "isarray": { "version": "0.0.1", @@ -91,7 +92,8 @@ }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@~0.10.x" + "from": "string_decoder@~0.10.x", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, "inherits": { "version": "2.0.1", @@ -103,7 +105,8 @@ }, "lzma": { "version": "1.3.7", - "from": "lzma@~1.3.7" + "from": "lzma@~1.3.7", + "resolved": "https://registry.npmjs.org/lzma/-/lzma-1.3.7.tgz" }, "node-varnish": { "version": "0.3.0", @@ -133,8 +136,7 @@ }, "nan": { "version": "1.1.2", - "from": "nan@~1.1.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" + "from": "nan@~1.1.0" } } } @@ -148,15 +150,16 @@ "rollbar": { "version": "0.3.13", "from": "rollbar@~0.3.13", + "resolved": "https://registry.npmjs.org/rollbar/-/rollbar-0.3.13.tgz", "dependencies": { "node-uuid": { - "version": "1.4.1", - "from": "node-uuid@1.4.x", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" + "version": "1.4.2", + "from": "node-uuid@1.4.x" }, "lru-cache": { "version": "2.2.4", - "from": "lru-cache@~2.2.1" + "from": "lru-cache@~2.2.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz" }, "json-stringify-safe": { "version": "5.0.0", @@ -170,13 +173,12 @@ }, "underscore": { "version": "1.6.0", - "from": "underscore@~1.6.0", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" + "from": "underscore@~1.6.0" }, "windshaft": { - "version": "0.32.1", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.1", - "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.1", + "version": "0.32.2", + "from": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik", "dependencies": { "chronograph": { "version": "0.1.0", @@ -195,18 +197,15 @@ "dependencies": { "underscore": { "version": "1.4.4", - "from": "underscore@~1.4.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" + "from": "underscore@~1.4.3" }, "mapnik-reference": { "version": "5.0.9", - "from": "mapnik-reference@~5.0.7", - "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz" + "from": "mapnik-reference@~5.0.7" }, "xml2js": { "version": "0.2.8", "from": "xml2js@~0.2.4", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz", "dependencies": { "sax": { "version": "0.5.8", @@ -217,7 +216,6 @@ "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -234,7 +232,6 @@ "millstone": { "version": "0.6.14", "from": "millstone@0.6.14", - "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.14.tgz", "dependencies": { "generic-pool": { "version": "2.0.4", @@ -243,7 +240,6 @@ "request": { "version": "2.34.0", "from": "request@~2.34.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz", "dependencies": { "qs": { "version": "0.6.6", @@ -258,9 +254,8 @@ "from": "forever-agent@~0.5.0" }, "node-uuid": { - "version": "1.4.1", - "from": "node-uuid@~1.4.0", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz" + "version": "1.4.2", + "from": "node-uuid@~1.4.0" }, "tough-cookie": { "version": "0.12.1", @@ -268,8 +263,7 @@ "dependencies": { "punycode": { "version": "1.3.2", - "from": "punycode@>=0.2.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" + "from": "punycode@>=0.2.0" } } }, @@ -280,19 +274,16 @@ "combined-stream": { "version": "0.0.7", "from": "combined-stream@~0.0.4", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", "dependencies": { "delayed-stream": { "version": "0.0.5", - "from": "delayed-stream@0.0.5", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" + "from": "delayed-stream@0.0.5" } } }, "async": { "version": "0.9.0", - "from": "async@~0.9.0", - "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" + "from": "async@~0.9.0" } } }, @@ -325,12 +316,10 @@ "hawk": { "version": "1.0.0", "from": "hawk@~1.0.0", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz", "dependencies": { "hoek": { "version": "0.9.1", - "from": "hoek@0.9.x", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz" + "from": "hoek@0.9.x" }, "boom": { "version": "0.4.2", @@ -355,12 +344,10 @@ "srs": { "version": "0.4.6", "from": "srs@~0.4.1", - "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.6.tgz", "dependencies": { "nan": { "version": "1.4.1", - "from": "nan@~1.4.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz" + "from": "nan@~1.4.1" }, "node-pre-gyp": { "version": "0.6.1", @@ -774,12 +761,10 @@ "zipfile": { "version": "0.5.4", "from": "zipfile@~0.5.2", - "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz", "dependencies": { "nan": { "version": "1.4.1", - "from": "nan@~1.4.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz" + "from": "nan@~1.4.1" }, "node-pre-gyp": { "version": "0.6.1", @@ -1193,12 +1178,10 @@ "sqlite3": { "version": "2.2.7", "from": "sqlite3@2.x", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-2.2.7.tgz", "dependencies": { "nan": { "version": "1.1.2", - "from": "nan@1.1.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" + "from": "nan@1.1.2" }, "node-pre-gyp": { "version": "0.5.22", @@ -1576,8 +1559,7 @@ }, "mime": { "version": "1.2.11", - "from": "mime@~1.2.9", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" + "from": "mime@~1.2.9" }, "mkdirp": { "version": "0.3.5", @@ -1586,7 +1568,6 @@ "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -1605,46 +1586,38 @@ "express": { "version": "2.5.11", "from": "express@~2.5.11", - "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", "dependencies": { "connect": { "version": "1.9.2", "from": "connect@1.x", - "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz", "dependencies": { "formidable": { "version": "1.0.15", - "from": "formidable@1.0.x", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz" + "from": "formidable@1.0.x" } } }, "mime": { "version": "1.2.4", - "from": "mime@1.2.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz" + "from": "mime@1.2.4" }, "qs": { "version": "0.4.2", - "from": "qs@0.4.x", - "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz" + "from": "qs@0.4.x" }, "mkdirp": { "version": "0.3.0", - "from": "mkdirp@0.3.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" + "from": "mkdirp@0.3.0" } } }, "tilelive": { "version": "4.5.3", "from": "tilelive@~4.5.3", - "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz", "dependencies": { "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -1673,8 +1646,7 @@ }, "mime": { "version": "1.2.11", - "from": "mime@~1.2.11", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" + "from": "mime@~1.2.11" }, "sphericalmercator": { "version": "1.0.2", @@ -1683,9 +1655,9 @@ } }, "mapnik": { - "version": "1.4.15", - "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb", - "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb", + "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", "dependencies": { "nan": { "version": "1.2.0", @@ -1693,13 +1665,11 @@ }, "mapnik-vector-tile": { "version": "0.5.5", - "from": "mapnik-vector-tile@0.5.5", - "resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz" + "from": "mapnik-vector-tile@0.5.5" }, "node-pre-gyp": { "version": "0.5.25", "from": "node-pre-gyp@0.5.25", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz", "dependencies": { "nopt": { "version": "3.0.1", @@ -2089,8 +2059,7 @@ }, "nan": { "version": "1.1.2", - "from": "nan@~1.1.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" + "from": "nan@~1.1.0" } } } @@ -2103,18 +2072,15 @@ "dependencies": { "underscore": { "version": "1.4.4", - "from": "underscore@~1.4.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" + "from": "underscore@~1.4.3" }, "mapnik-reference": { "version": "5.0.9", - "from": "mapnik-reference@~5.0.7", - "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz" + "from": "mapnik-reference@~5.0.7" }, "xml2js": { "version": "0.2.8", "from": "xml2js@~0.2.4", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz", "dependencies": { "sax": { "version": "0.5.8", @@ -2125,7 +2091,6 @@ "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -2146,13 +2111,11 @@ }, "torque.js": { "version": "2.2.0", - "from": "torque.js@~2.2.0", - "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.2.00.tgz" + "from": "torque.js@~2.2.0" }, "node-statsd": { "version": "0.0.7", - "from": "node-statsd@~0.0.7", - "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz" + "from": "node-statsd@~0.0.7" } } } diff --git a/package.json b/package.json index 7636aee2..34b7312f 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/0.32.1", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0", From 839f8b062b5ddaf8d0c801fc110128ea6f229e77 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 11 Dec 2014 10:12:40 +0100 Subject: [PATCH 2/6] Changes to windshaft tagged version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34b7312f..d5caba8a 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/upgrade-mapnik", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.2", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0", From 25f7e58b3ae57b0c69deeb4fe90770d7a550ee3b Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 11 Dec 2014 10:16:05 +0100 Subject: [PATCH 3/6] Re-generate npm-shrinkwrap.json --- npm-shrinkwrap.json | 114 +++++++++++++++++++++++++++++--------------- 1 file changed, 76 insertions(+), 38 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8e7d6d09..d83ab933 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -52,7 +52,8 @@ }, "nan": { "version": "1.1.2", - "from": "nan@~1.1.0" + "from": "nan@~1.1.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" } } } @@ -82,8 +83,7 @@ "dependencies": { "core-util-is": { "version": "1.0.1", - "from": "core-util-is@~1.0.0", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz" + "from": "core-util-is@~1.0.0" }, "isarray": { "version": "0.0.1", @@ -92,8 +92,7 @@ }, "string_decoder": { "version": "0.10.31", - "from": "string_decoder@~0.10.x", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "from": "string_decoder@~0.10.x" }, "inherits": { "version": "2.0.1", @@ -105,8 +104,7 @@ }, "lzma": { "version": "1.3.7", - "from": "lzma@~1.3.7", - "resolved": "https://registry.npmjs.org/lzma/-/lzma-1.3.7.tgz" + "from": "lzma@~1.3.7" }, "node-varnish": { "version": "0.3.0", @@ -136,7 +134,8 @@ }, "nan": { "version": "1.1.2", - "from": "nan@~1.1.0" + "from": "nan@~1.1.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" } } } @@ -150,16 +149,15 @@ "rollbar": { "version": "0.3.13", "from": "rollbar@~0.3.13", - "resolved": "https://registry.npmjs.org/rollbar/-/rollbar-0.3.13.tgz", "dependencies": { "node-uuid": { "version": "1.4.2", - "from": "node-uuid@1.4.x" + "from": "node-uuid@1.4.x", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz" }, "lru-cache": { "version": "2.2.4", - "from": "lru-cache@~2.2.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz" + "from": "lru-cache@~2.2.1" }, "json-stringify-safe": { "version": "5.0.0", @@ -173,12 +171,13 @@ }, "underscore": { "version": "1.6.0", - "from": "underscore@~1.6.0" + "from": "underscore@~1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { "version": "0.32.2", - "from": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik", - "resolved": "https://github.com/CartoDB/Windshaft/tarball/upgrade-mapnik", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.2", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.2", "dependencies": { "chronograph": { "version": "0.1.0", @@ -197,15 +196,18 @@ "dependencies": { "underscore": { "version": "1.4.4", - "from": "underscore@~1.4.3" + "from": "underscore@~1.4.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" }, "mapnik-reference": { "version": "5.0.9", - "from": "mapnik-reference@~5.0.7" + "from": "mapnik-reference@~5.0.7", + "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz" }, "xml2js": { "version": "0.2.8", "from": "xml2js@~0.2.4", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz", "dependencies": { "sax": { "version": "0.5.8", @@ -216,6 +218,7 @@ "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -232,6 +235,7 @@ "millstone": { "version": "0.6.14", "from": "millstone@0.6.14", + "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.14.tgz", "dependencies": { "generic-pool": { "version": "2.0.4", @@ -240,6 +244,7 @@ "request": { "version": "2.34.0", "from": "request@~2.34.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz", "dependencies": { "qs": { "version": "0.6.6", @@ -255,7 +260,8 @@ }, "node-uuid": { "version": "1.4.2", - "from": "node-uuid@~1.4.0" + "from": "node-uuid@~1.4.0", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz" }, "tough-cookie": { "version": "0.12.1", @@ -263,7 +269,8 @@ "dependencies": { "punycode": { "version": "1.3.2", - "from": "punycode@>=0.2.0" + "from": "punycode@>=0.2.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" } } }, @@ -274,16 +281,19 @@ "combined-stream": { "version": "0.0.7", "from": "combined-stream@~0.0.4", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", "dependencies": { "delayed-stream": { "version": "0.0.5", - "from": "delayed-stream@0.0.5" + "from": "delayed-stream@0.0.5", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz" } } }, "async": { "version": "0.9.0", - "from": "async@~0.9.0" + "from": "async@~0.9.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" } } }, @@ -316,10 +326,12 @@ "hawk": { "version": "1.0.0", "from": "hawk@~1.0.0", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz", "dependencies": { "hoek": { "version": "0.9.1", - "from": "hoek@0.9.x" + "from": "hoek@0.9.x", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz" }, "boom": { "version": "0.4.2", @@ -344,10 +356,12 @@ "srs": { "version": "0.4.6", "from": "srs@~0.4.1", + "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.6.tgz", "dependencies": { "nan": { "version": "1.4.1", - "from": "nan@~1.4.1" + "from": "nan@~1.4.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz" }, "node-pre-gyp": { "version": "0.6.1", @@ -761,10 +775,12 @@ "zipfile": { "version": "0.5.4", "from": "zipfile@~0.5.2", + "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz", "dependencies": { "nan": { "version": "1.4.1", - "from": "nan@~1.4.1" + "from": "nan@~1.4.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz" }, "node-pre-gyp": { "version": "0.6.1", @@ -1178,10 +1194,12 @@ "sqlite3": { "version": "2.2.7", "from": "sqlite3@2.x", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-2.2.7.tgz", "dependencies": { "nan": { "version": "1.1.2", - "from": "nan@1.1.2" + "from": "nan@1.1.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" }, "node-pre-gyp": { "version": "0.5.22", @@ -1559,7 +1577,8 @@ }, "mime": { "version": "1.2.11", - "from": "mime@~1.2.9" + "from": "mime@~1.2.9", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "mkdirp": { "version": "0.3.5", @@ -1568,6 +1587,7 @@ "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -1586,38 +1606,46 @@ "express": { "version": "2.5.11", "from": "express@~2.5.11", + "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz", "dependencies": { "connect": { "version": "1.9.2", "from": "connect@1.x", + "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz", "dependencies": { "formidable": { "version": "1.0.15", - "from": "formidable@1.0.x" + "from": "formidable@1.0.x", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz" } } }, "mime": { "version": "1.2.4", - "from": "mime@1.2.4" + "from": "mime@1.2.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz" }, "qs": { "version": "0.4.2", - "from": "qs@0.4.x" + "from": "qs@0.4.x", + "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz" }, "mkdirp": { "version": "0.3.0", - "from": "mkdirp@0.3.0" + "from": "mkdirp@0.3.0", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" } } }, "tilelive": { "version": "4.5.3", "from": "tilelive@~4.5.3", + "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-4.5.3.tgz", "dependencies": { "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -1646,11 +1674,12 @@ }, "mime": { "version": "1.2.11", - "from": "mime@~1.2.11" + "from": "mime@~1.2.11", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "sphericalmercator": { "version": "1.0.2", - "from": "sphericalmercator@~1.0.2" + "from": "sphericalmercator@~1.0.1" } } }, @@ -1665,11 +1694,13 @@ }, "mapnik-vector-tile": { "version": "0.5.5", - "from": "mapnik-vector-tile@0.5.5" + "from": "mapnik-vector-tile@0.5.5", + "resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz" }, "node-pre-gyp": { "version": "0.5.25", "from": "node-pre-gyp@0.5.25", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz", "dependencies": { "nopt": { "version": "3.0.1", @@ -2059,7 +2090,8 @@ }, "nan": { "version": "1.1.2", - "from": "nan@~1.1.0" + "from": "nan@~1.1.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" } } } @@ -2072,15 +2104,18 @@ "dependencies": { "underscore": { "version": "1.4.4", - "from": "underscore@~1.4.3" + "from": "underscore@~1.4.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz" }, "mapnik-reference": { "version": "5.0.9", - "from": "mapnik-reference@~5.0.7" + "from": "mapnik-reference@~5.0.7", + "resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz" }, "xml2js": { "version": "0.2.8", "from": "xml2js@~0.2.4", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz", "dependencies": { "sax": { "version": "0.5.8", @@ -2091,6 +2126,7 @@ "optimist": { "version": "0.6.1", "from": "optimist@~0.6.0", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { "version": "0.0.2", @@ -2111,11 +2147,13 @@ }, "torque.js": { "version": "2.2.0", - "from": "torque.js@~2.2.0" + "from": "torque.js@~2.2.0", + "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.2.00.tgz" }, "node-statsd": { "version": "0.0.7", - "from": "node-statsd@~0.0.7" + "from": "node-statsd@~0.0.7", + "resolved": "https://registry.npmjs.org/node-statsd/-/node-statsd-0.0.7.tgz" } } } From 1a9bc5550cf4ade378d63e7c8a3a2dea5fc4e00c Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 11 Dec 2014 10:17:12 +0100 Subject: [PATCH 4/6] Make windshaft version visible in news --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index eddc88a7..f44f3ca3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -------------------- Announcements: - - Upgrades windshaft to upgrade-mapnik branch + - Upgrades windshaft to 0.32.2 Bugfixes: - Closes fd for log files on `kill -HUP` (#230) From 0453166326fea7262ffb77f802b19d39d3b5cf24 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 11 Dec 2014 10:22:56 +0100 Subject: [PATCH 5/6] Release 1.21.1 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index f44f3ca3..1d5a7449 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -1.21.1 -- 2014-mm-dd +1.21.1 -- 2014-12-11 -------------------- Announcements: From e9383a2f0c649db62f44fcf80ee373781cb13fe7 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 11 Dec 2014 10:24:22 +0100 Subject: [PATCH 6/6] Stubs next version --- NEWS.md | 4 ++++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1d5a7449..e1613e13 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +1.21.2 -- 2014-mm-dd +-------------------- + + 1.21.1 -- 2014-12-11 -------------------- diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d83ab933..2bd258c1 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.21.1", + "version": "1.21.2", "dependencies": { "cartodb-psql": { "version": "0.4.0", diff --git a/package.json b/package.json index d5caba8a..73f8e3b2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.21.1", + "version": "1.21.2", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"