From 2e4526ce8eaabb72f2e0c70acf3a9459db68dda6 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 14 Nov 2013 16:26:05 +0100
Subject: [PATCH] Require windshaft-0.14.3 to get 3 new bugfixes:

 - Return CORS headers when creating layergroups via GET
 - Fix http status on database authentication error
 - Ensure bogus text-face-name error raises at layergroup creation
---
 NEWS.md             |  9 +++++++++
 npm-shrinkwrap.json | 20 ++++++++++----------
 package.json        |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 5c354a4b..51258ac6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,11 +1,20 @@
 1.5.0 -- 2013-MM-DD
 -------------------
 
+Improvements:
+
 * Add support for configuring database connection passwords
 * Optionally read user-specific database_host and database_password
   from redis as per CartoDB-2.5.0 model (#88, #89)
 * Do not force ending dot in SQL-API hostname, for easier testing
 
+Bug fixes:
+
+* Return CORS headers when creating layergroups via GET (windshaft/#92)
+* Fix http status on database authentication error (windshaft/#94)
+* Fix text-face-name error at layergroup creation (windshaft/#93)
+
+
 1.4.1 -- 2013-11-08
 -------------------
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3de2c43e..8636b9bd 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "dependencies": {
     "node-varnish": {
       "version": "0.1.1"
@@ -9,7 +9,7 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.14.2",
+      "version": "0.14.3",
       "dependencies": {
         "grainstore": {
           "version": "0.14.2",
@@ -236,8 +236,8 @@
           }
         },
         "tilelive-mapnik": {
-          "version": "0.5.0",
-          "from": "git://github.com/Vizzuality/tilelive-mapnik.git#5908346",
+          "version": "0.5.0-cdb2",
+          "from": "git://github.com/Vizzuality/tilelive-mapnik.git#0.5.0-cdb2",
           "dependencies": {
             "eio": {
               "version": "0.2.2"
@@ -259,16 +259,16 @@
       "version": "0.0.5"
     },
     "generic-pool": {
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "redis": {
-      "version": "0.8.3"
+      "version": "0.8.6"
     },
     "hiredis": {
       "version": "0.1.15",
       "dependencies": {
         "bindings": {
-          "version": "1.1.0"
+          "version": "1.1.1"
         }
       }
     },
@@ -276,10 +276,10 @@
       "version": "2.9.202"
     },
     "mapnik": {
-      "version": "0.7.22"
+      "version": "0.7.25"
     },
     "strftime": {
-      "version": "0.6.0"
+      "version": "0.6.2"
     },
     "lzma": {
       "version": "1.2.3"
@@ -308,7 +308,7 @@
           "version": "1.0.2"
         },
         "debug": {
-          "version": "0.7.2"
+          "version": "0.7.4"
         }
       }
     }
diff --git a/package.json b/package.json
index f804a37a..7306c3ee 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "dependencies": {
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "~0.14.2",
+        "windshaft"  : "~0.14.3",
         "step": "0.0.x",
         "generic-pool": "~2.0.3",
         "redis": "~0.8.3",