Merge branch 'master' into analysis-layers

NEWS.md

@@ -1,8 +1,16 @@
 # Changelog
 
+## 2.26.3
+
+Released 2016-mm-dd
+
+
 ## 2.26.2
 
-Released 2016-mm-dd
+Released 2016-02-25
+
+Announcements:
+ - Upgrades windshaft to [1.13.2](https://github.com/CartoDB/Windshaft/releases/tag/1.13.2)
 
 
 ## 2.26.1

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.26.2",
+  "version": "2.26.3",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -987,7 +987,7 @@
           "dependencies": {
             "async": {
               "version": "1.5.2",
-              "from": "async@>=1.4.0 <2.0.0",
+              "from": "async@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
             }
           }
@@ -1239,9 +1239,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.13.1",
+      "version": "1.13.2",
-      "from": "windshaft@1.13.1",
+      "from": "windshaft@1.13.2",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.13.2.tgz",
       "dependencies": {
         "abaculus": {
           "version": "1.1.0-cdb4",
@@ -4562,9 +4562,9 @@
                           "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
                         },
                         "tweetnacl": {
-                          "version": "0.14.0",
+                          "version": "0.14.1",
                           "from": "tweetnacl@>=0.13.0 <1.0.0",
-                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.0.tgz"
+                          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"
                         },
                         "jodid25519": {
                           "version": "1.0.2",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.26.2",
+    "version": "2.26.3",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -26,7 +26,7 @@
         "node-statsd": "~0.0.7",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "1.13.1",
+        "windshaft": "1.13.2",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",

test/acceptance/multilayer_server.js

@@ -70,7 +70,8 @@ describe('tests from old api translated to multilayer', function() {
             },
             function(res) {
                 var parsed = JSON.parse(res.body);
-                assert.ok(parsed.errors[0].match(/<css input>:1:1: Unclosed block/));
+                assert.ok(parsed.errors[0].match(/^style0/));
+                assert.ok(parsed.errors[0].match(/missing closing/));
                 done();
             }
         );