Merge branch 'master' into new_querytables_library

.travis.yml

@@ -1,16 +1,11 @@
-sudo: false
+sudo: true
 
 addons:
-  postgresql: "9.4"
-  apt:
-    packages:
-    - postgresql-plpython-9.4
-    - pkg-config
-    - libcairo2-dev
-    - libjpeg8-dev
-    - libgif-dev
+  postgresql: "9.3"
 
 before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y postgresql-plpython-9.3 pkg-config libcairo2-dev libjpeg8-dev libgif-dev
   - npm install -g npm@2
   - createdb template_postgis
   - createuser publicuser

NEWS.md

@@ -1,6 +1,32 @@
 # Changelog
 
-## 2.25.3
+## 2.26.3
+
+Released 2016-mm-dd
+
+
+## 2.26.2
+
+Released 2016-02-25
+
+Announcements:
+ - Upgrades windshaft to [1.13.2](https://github.com/CartoDB/Windshaft/releases/tag/1.13.2)
+
+
+## 2.26.1
+
+Released 2016-02-24
+
+Announcements:
+ - Upgrades windshaft to [1.13.1](https://github.com/CartoDB/Windshaft/releases/tag/1.13.1)
+
+
+## 2.26.0
+
+Released 2016-02-24
+
+Announcements:
+ - Upgrades windshaft to [1.13.0](https://github.com/CartoDB/Windshaft/releases/tag/1.13.0)
 
 
 ## 2.25.2

lib/cartodb/api/overviews_metadata_api.js

@@ -25,8 +25,7 @@ OverviewsMetadataApi.prototype.getOverviewsMetadata = function (username, sql, c
     var query = 'SELECT * FROM CDB_Overviews(CDB_QueryTablesText($windshaft$' + prepareSql(sql) + '$windshaft$))';
     this.pgQueryRunner.run(username, query, function handleOverviewsRows(err, rows) {
         if (err){
-            var msg = err.message ? err.message : err;
-            callback(new Error('could not get overviews metadata: ' + msg));
+            callback(err);
             return;
         }
         var metadata = {};

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.25.3",
+    "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.11.1",
+        "windshaft": "1.13.2",
         "step": "~0.0.6",
         "queue-async": "~1.0.7",
         "request": "~2.62.0",

test/acceptance/multilayer_server.js

@@ -335,7 +335,7 @@ describe('tests from old api translated to multilayer', function() {
 
                 var parsed = JSON.parse(res.body);
                 assert.deepEqual(parsed, {
-                    errors: ["could not get overviews metadata: fake error message"]
+                    errors: ["fake error message"]
                 });
 
                 done();