diff --git a/NEWS.md b/NEWS.md index d6bef7d2..e85e78d9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ -------------------- Announcements: - - Upgrades windshaft to 0.32.0 + - Upgrades windshaft to 0.32.1 Bugfixes: - Closes fd for log files on `kill -HUP` (#230) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index d2646362..76bc76f1 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -174,9 +174,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.32.0", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.0", - "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.0", + "version": "0.32.1", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.32.1", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.1", "dependencies": { "chronograph": { "version": "0.1.0", @@ -184,9 +184,9 @@ "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d" }, "grainstore": { - "version": "0.22.0", - "from": "https://github.com/CartoDB/grainstore/tarball/0.22.0", - "resolved": "https://github.com/CartoDB/grainstore/tarball/0.22.0", + "version": "0.22.1", + "from": "https://github.com/CartoDB/grainstore/tarball/0.22.1", + "resolved": "https://github.com/CartoDB/grainstore/tarball/0.22.1", "dependencies": { "carto": { "version": "0.9.5-cdb2", @@ -232,17 +232,129 @@ } }, "millstone": { - "version": "0.6.15", - "from": "millstone@~0.6.14", - "resolved": "https://registry.npmjs.org/millstone/-/millstone-0.6.15.tgz", + "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.1.1", - "from": "generic-pool@~2.1.1" + "version": "2.0.4", + "from": "generic-pool@~2.0.3" + }, + "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", + "from": "qs@~0.6.0" + }, + "json-stringify-safe": { + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0" + }, + "forever-agent": { + "version": "0.5.2", + "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" + }, + "tough-cookie": { + "version": "0.12.1", + "from": "tough-cookie@>=0.12.0", + "dependencies": { + "punycode": { + "version": "1.3.2", + "from": "punycode@>=0.2.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" + } + } + }, + "form-data": { + "version": "0.1.4", + "from": "form-data@~0.1.0", + "dependencies": { + "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" + } + } + }, + "async": { + "version": "0.9.0", + "from": "async@~0.9.0", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz" + } + } + }, + "tunnel-agent": { + "version": "0.3.0", + "from": "tunnel-agent@~0.3.0" + }, + "http-signature": { + "version": "0.10.0", + "from": "http-signature@~0.10.0", + "dependencies": { + "assert-plus": { + "version": "0.1.2", + "from": "assert-plus@0.1.2" + }, + "asn1": { + "version": "0.1.11", + "from": "asn1@0.1.11" + }, + "ctype": { + "version": "0.5.2", + "from": "ctype@0.5.2" + } + } + }, + "oauth-sign": { + "version": "0.3.0", + "from": "oauth-sign@~0.3.0" + }, + "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" + }, + "boom": { + "version": "0.4.2", + "from": "boom@0.4.x" + }, + "cryptiles": { + "version": "0.2.2", + "from": "cryptiles@0.2.x" + }, + "sntp": { + "version": "0.2.4", + "from": "sntp@0.2.x" + } + } + }, + "aws-sign2": { + "version": "0.5.0", + "from": "aws-sign2@~0.5.0" + } + } }, "srs": { "version": "0.4.6", - "from": "srs@~0.4.6", + "from": "srs@~0.4.1", "resolved": "https://registry.npmjs.org/srs/-/srs-0.4.6.tgz", "dependencies": { "nan": { @@ -661,7 +773,7 @@ }, "zipfile": { "version": "0.5.4", - "from": "zipfile@~0.5.4", + "from": "zipfile@~0.5.2", "resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz", "dependencies": { "nan": { @@ -1079,18 +1191,19 @@ } }, "sqlite3": { - "version": "3.0.4", - "from": "sqlite3@2.x || 3.x", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-3.0.4.tgz", + "version": "2.2.7", + "from": "sqlite3@2.x", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-2.2.7.tgz", "dependencies": { "nan": { - "version": "1.4.1", - "from": "nan@~1.4.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.4.1.tgz" + "version": "1.1.2", + "from": "nan@1.1.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz" }, "node-pre-gyp": { - "version": "0.6.1", - "from": "node-pre-gyp@~0.6.1", + "version": "0.5.22", + "from": "node-pre-gyp@0.5.22", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.22.tgz", "dependencies": { "nopt": { "version": "3.0.1", @@ -1117,59 +1230,64 @@ } }, "request": { - "version": "2.48.0", + "version": "2.39.0", "from": "request@2.x", - "resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz", + "resolved": "https://registry.npmjs.org/request/-/request-2.39.0.tgz", "dependencies": { - "bl": { - "version": "0.9.3", - "from": "bl@~0.9.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz", - "dependencies": { - "readable-stream": { - "version": "1.0.33", - "from": "readable-stream@~1.0.26", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", - "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" - }, - "isarray": { - "version": "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", - "from": "string_decoder@~0.10.x", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "inherits": { - "version": "2.0.1", - "from": "inherits@~2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - } - } + "qs": { + "version": "0.6.6", + "from": "qs@~0.6.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz" }, - "caseless": { - "version": "0.7.0", - "from": "caseless@~0.7.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz" + "json-stringify-safe": { + "version": "5.0.0", + "from": "json-stringify-safe@~5.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz" + }, + "mime-types": { + "version": "1.0.2", + "from": "mime-types@~1.0.1", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz" }, "forever-agent": { "version": "0.5.2", "from": "forever-agent@~0.5.0", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz" }, + "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" + }, + "tough-cookie": { + "version": "0.12.1", + "from": "tough-cookie@>=0.12.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz", + "dependencies": { + "punycode": { + "version": "1.3.0", + "from": "punycode@>=0.2.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz" + } + } + }, "form-data": { "version": "0.1.4", "from": "form-data@~0.1.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz", "dependencies": { + "combined-stream": { + "version": "0.0.5", + "from": "combined-stream@~0.0.4", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.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" + } + } + }, "mime": { "version": "1.2.11", "from": "mime@~1.2.11", @@ -1182,43 +1300,11 @@ } } }, - "json-stringify-safe": { - "version": "5.0.0", - "from": "json-stringify-safe@~5.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz" - }, - "mime-types": { - "version": "1.0.2", - "from": "mime-types@~1.0.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz" - }, - "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" - }, - "qs": { - "version": "2.3.3", - "from": "qs@~2.3.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz" - }, "tunnel-agent": { "version": "0.4.0", "from": "tunnel-agent@~0.4.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" }, - "tough-cookie": { - "version": "0.12.1", - "from": "tough-cookie@>=0.12.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz", - "dependencies": { - "punycode": { - "version": "1.3.2", - "from": "punycode@>=0.2.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz" - } - } - }, "http-signature": { "version": "0.10.0", "from": "http-signature@~0.10.0", @@ -1242,9 +1328,9 @@ } }, "oauth-sign": { - "version": "0.5.0", - "from": "oauth-sign@~0.5.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz" + "version": "0.3.0", + "from": "oauth-sign@~0.3.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz" }, "hawk": { "version": "1.1.1", @@ -1282,30 +1368,18 @@ "version": "0.0.4", "from": "stringstream@~0.0.4", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz" - }, - "combined-stream": { - "version": "0.0.7", - "from": "combined-stream@~0.0.5", - "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" - } - } } } }, "semver": { - "version": "4.1.0", - "from": "semver@~4.1.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-4.1.0.tgz" + "version": "3.0.1", + "from": "semver@~3.0.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz" }, "tar": { - "version": "1.0.2", - "from": "tar@~1.0.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz", + "version": "1.0.0", + "from": "tar@~1.0.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-1.0.0.tgz", "dependencies": { "block-stream": { "version": "0.0.7", @@ -1313,20 +1387,20 @@ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz" }, "fstream": { - "version": "1.0.2", - "from": "fstream@^1.0.2", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz", + "version": "1.0.1", + "from": "fstream@^1.0.0", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.1.tgz", "dependencies": { "graceful-fs": { - "version": "3.0.4", + "version": "3.0.2", "from": "graceful-fs@3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz" + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" } } }, "inherits": { "version": "2.0.1", - "from": "inherits@2", + "from": "inherits@~2.0.1", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -1357,13 +1431,13 @@ "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz", "dependencies": { "graceful-fs": { - "version": "3.0.4", - "from": "graceful-fs@~3.0.2", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz" + "version": "3.0.2", + "from": "graceful-fs@3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz" }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.0", + "from": "inherits@2", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -1415,9 +1489,9 @@ } }, "readable-stream": { - "version": "1.0.33", + "version": "1.0.27-1", "from": "readable-stream@~1.0.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz", "dependencies": { "core-util-is": { "version": "1.0.1", @@ -1430,13 +1504,13 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { - "version": "0.10.31", + "version": "0.10.25-1", "from": "string_decoder@~0.10.x", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz" }, "inherits": { "version": "2.0.1", - "from": "inherits@~2.0.1", + "from": "inherits@2", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -1461,9 +1535,9 @@ } }, "rc": { - "version": "0.5.4", - "from": "rc@~0.5.1", - "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.4.tgz", + "version": "0.5.0", + "from": "rc@~0.5.0", + "resolved": "https://registry.npmjs.org/rc/-/rc-0.5.0.tgz", "dependencies": { "minimist": { "version": "0.0.10", @@ -1493,29 +1567,25 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz" } } + }, + "set-immediate": { + "version": "0.1.1", + "from": "set-immediate@0.1.1" } } }, "mime": { "version": "1.2.11", - "from": "mime@~1.2.11", + "from": "mime@~1.2.9", "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz" }, "mkdirp": { - "version": "0.5.0", - "from": "mkdirp@~0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", - "dependencies": { - "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" - } - } + "version": "0.3.5", + "from": "mkdirp@~0.3.3" }, "optimist": { "version": "0.6.1", - "from": "optimist@~0.6.1", + "from": "optimist@~0.6.0", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "dependencies": { "wordwrap": { diff --git a/package.json b/package.json index 4238ac33..7636aee2 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.0", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.1", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",