From 7894acf8308005430e7cd13b3eb518c22a41786e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 24 Feb 2016 17:16:30 +0100 Subject: [PATCH 1/3] Upgrade windshaft to 1.13.1 --- NEWS.md | 3 +++ npm-shrinkwrap.json | 14 +++++++------- package.json | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index 34f08876..f0fd825e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,9 @@ Released 2016-mm-dd +Announcements: + - Upgrades windshaft to [1.13.1](https://github.com/CartoDB/Windshaft/releases/tag/1.13.1) + ## 2.26.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 345a8a7a..54dd7028 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -85,7 +85,7 @@ }, "mime-types": { "version": "2.1.10", - "from": "mime-types@>=2.1.2 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { @@ -193,7 +193,7 @@ "dependencies": { "mime-types": { "version": "2.1.10", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { @@ -382,7 +382,7 @@ }, "mime-types": { "version": "2.1.10", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { @@ -597,7 +597,7 @@ }, "mime-types": { "version": "2.1.10", - "from": "mime-types@>=2.1.2 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz", "dependencies": { "mime-db": { @@ -837,9 +837,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.13.0", - "from": "windshaft@1.13.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.0.tgz", + "version": "1.13.1", + "from": "windshaft@1.13.1", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.1.tgz", "dependencies": { "abaculus": { "version": "1.1.0-cdb4", diff --git a/package.json b/package.json index 90c8b103..697be528 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.13.0", + "windshaft": "1.13.1", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From 6131c4a66ae0d7b015733b0a06f5f1f061f600cc Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 24 Feb 2016 17:22:04 +0100 Subject: [PATCH 2/3] Release 2.26.1 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index f0fd825e..5ecb4d4f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.26.1 -Released 2016-mm-dd +Released 2016-02-24 Announcements: - Upgrades windshaft to [1.13.1](https://github.com/CartoDB/Windshaft/releases/tag/1.13.1) From 06164af17f4964ecbb77825d303eec104dfb481d Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 24 Feb 2016 17:23:15 +0100 Subject: [PATCH 3/3] Stubs next version --- NEWS.md | 5 +++++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 5ecb4d4f..acba8731 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Changelog +## 2.26.2 + +Released 2016-mm-dd + + ## 2.26.1 Released 2016-02-24 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 54dd7028..cd12953c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.26.1", + "version": "2.26.2", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 697be528..c8037eef 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.26.1", + "version": "2.26.2", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"