From 65e539d4c893ef9a692ffdaa98a5117f570333fa Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 18 Feb 2016 13:49:10 +0100 Subject: [PATCH 1/2] Upgrade windshaft --- npm-shrinkwrap.json | 52 ++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 36867205..4431e81c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -84,14 +84,14 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" }, "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.9 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "version": "1.22.0", + "from": "mime-db@>=1.22.0 <1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" } } } @@ -192,14 +192,14 @@ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", "dependencies": { "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.6 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "version": "1.22.0", + "from": "mime-db@>=1.22.0 <1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" } } }, @@ -381,14 +381,14 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" }, "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.6 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "version": "1.22.0", + "from": "mime-db@>=1.22.0 <1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" } } } @@ -443,7 +443,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@>=2.0.0 <3.0.0", + "from": "inherits@>=2.0.1 <2.1.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -596,14 +596,14 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz" }, "mime-types": { - "version": "2.1.9", + "version": "2.1.10", "from": "mime-types@>=2.1.2 <2.2.0", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { - "version": "1.21.0", - "from": "mime-db@>=1.21.0 <1.22.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" + "version": "1.22.0", + "from": "mime-db@>=1.22.0 <1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz" } } }, @@ -777,9 +777,9 @@ } }, "is-my-json-valid": { - "version": "2.12.4", + "version": "2.13.0", "from": "is-my-json-valid@>=2.12.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -830,9 +830,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.10.1", - "from": "windshaft@1.10.1", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.1.tgz", + "version": "1.11.0", + "from": "windshaft@1.11.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.11.0.tgz", "dependencies": { "mapnik": { "version": "1.4.15-cdb6", diff --git a/package.json b/package.json index 4e2e3145..238cda74 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.10.1", + "windshaft": "1.11.0", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From b3f62e163144565547710af3428e975e44a4009b Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 18 Feb 2016 14:27:44 +0100 Subject: [PATCH 2/2] Update news and bump version --- NEWS.md | 7 +++++-- npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 784d26af..a4e937b0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,16 +1,19 @@ # Changelog -## 2.24.1 +## 2.25.0 Released 2016-mm-dd +Announcements: + - Upgrades windshaft to [1.11.0](https://github.com/CartoDB/Windshaft/releases/tag/1.11.0) + ## 2.24.0 Released 2016-02-15 Announcements: - - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) + - Upgrades windshaft to [1.10.1](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) ## 2.23.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 4431e81c..ec5c7c7e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.24.1", + "version": "2.25.0", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 238cda74..6bcce7b5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.24.1", + "version": "2.25.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"