diff --git a/NEWS.md b/NEWS.md index 00c883b9..f03836ac 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,7 @@ NOTE: configuration sqlapi.host renamed to sqlapi.domain * Improve empty CartoCSS error message * Improve invalid mapnik-geometry-type CSS error message +* Fix race condition in localization of network resources 1.3.3 ------ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 80818410..90c65f87 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -9,10 +9,10 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.13.3", + "version": "0.13.4", "dependencies": { "grainstore": { - "version": "0.13.7", + "version": "0.13.8", "dependencies": { "carto": { "version": "0.9.3-cdb3", @@ -36,19 +36,75 @@ "version": "5.0.4" }, "millstone": { - "version": "0.5.15", + "version": "0.6.0-cdb1", + "from": "git://github.com/CartoDB/millstone.git#cdb-0.6.0-cdb1", "dependencies": { - "generic-pool": { - "version": "1.0.12" + "underscore": { + "version": "1.5.1" }, "request": { - "version": "2.11.4", + "version": "2.26.0", "dependencies": { + "qs": { + "version": "0.6.5" + }, + "json-stringify-safe": { + "version": "5.0.0" + }, + "forever-agent": { + "version": "0.5.0" + }, + "tunnel-agent": { + "version": "0.3.0" + }, + "http-signature": { + "version": "0.10.0", + "dependencies": { + "assert-plus": { + "version": "0.1.2" + }, + "asn1": { + "version": "0.1.11" + }, + "ctype": { + "version": "0.5.2" + } + } + }, + "hawk": { + "version": "1.0.0", + "dependencies": { + "hoek": { + "version": "0.9.1" + }, + "boom": { + "version": "0.4.2" + }, + "cryptiles": { + "version": "0.2.2" + }, + "sntp": { + "version": "0.2.4" + } + } + }, + "aws-sign": { + "version": "0.3.0" + }, + "oauth-sign": { + "version": "0.3.0" + }, + "cookie-jar": { + "version": "0.3.0" + }, + "node-uuid": { + "version": "1.4.1" + }, "form-data": { - "version": "0.0.3", + "version": "0.1.1", "dependencies": { "combined-stream": { - "version": "0.0.3", + "version": "0.0.4", "dependencies": { "delayed-stream": { "version": "0.0.5" @@ -56,17 +112,14 @@ } }, "async": { - "version": "0.1.9" + "version": "0.2.9" } } - }, - "mime": { - "version": "1.2.7" } } }, "srs": { - "version": "0.2.20" + "version": "0.3.2" }, "zipfile": { "version": "0.4.0" @@ -79,6 +132,17 @@ }, "mkdirp": { "version": "0.3.5" + }, + "optimist": { + "version": "0.6.0", + "dependencies": { + "wordwrap": { + "version": "0.0.2" + }, + "minimist": { + "version": "0.0.2" + } + } } } } diff --git a/package.json b/package.json index 9ff6e770..041768d3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "node-varnish": "0.1.1", "underscore" : "~1.3.3", - "windshaft" : "~0.13.3", + "windshaft" : "~0.13.4", "step": "0.0.x", "generic-pool": "~2.0.3", "redis": "~0.8.3",