diff --git a/NEWS.md b/NEWS.md index 3e39115d..e1fd64fb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,7 @@ * Fix X-Cache-Channel for multilayer (by token) responses * Add last_modified field to POST layergroup response (#72) * Deprecate signal handler for USR1, add handler for USR2 (#71) +* Fix support for ampersend characters in CartoCSS 1.1.8 ----- diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index b61b56fe..02733829 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -187,11 +187,11 @@ "version": "1.3.3" }, "grainstore": { - "version": "0.11.1", + "version": "0.11.2", "dependencies": { "carto": { - "version": "0.9.3-cdb2", - "from": "git://github.com/CartoDB/carto.git#cdb-0.9", + "version": "0.9.3-cdb3", + "from": "git://github.com/CartoDB/carto.git#cdb-0.9.3-cdb3", "dependencies": { "mapnik-reference": { "version": "5.0.0-cdb1", @@ -213,8 +213,11 @@ "millstone": { "version": "0.5.15", "dependencies": { + "generic-pool": { + "version": "2.0.3" + }, "request": { - "version": "2.11.4", + "version": "2.12.0", "dependencies": { "form-data": { "version": "0.0.3", @@ -244,7 +247,7 @@ "version": "0.3.4" }, "sqlite3": { - "version": "2.1.5" + "version": "2.1.7" }, "mime": { "version": "1.2.9" diff --git a/package.json b/package.json index cad96acd..003cdf79 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production", "node-varnish": "0.1.1", "underscore" : "~1.3.3", - "grainstore" : "~0.11.1", + "grainstore" : "~0.11.2", "windshaft" : "~0.9.2", "step": "0.0.x", "generic-pool": "~1.0.12",