Release 2.70.0

Merge pull request #565 from CartoDB/update-camshaft
Upgrade camshaft to 0.40.0
2016-08-16 12:24:23 +02:00 · 2016-08-16 12:19:25 +02:00 · 2016-08-16 11:33:32 +02:00 · 2016-08-12 10:34:33 +02:00 · 2016-08-12 10:33:10 +02:00 · 2016-08-12 10:24:06 +02:00
8 changed files with 134 additions and 108 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,12 @@ addons:
 before_install:
  - npm install -g npm@2
  - lsb_release -a
-  - sudo mv /etc/apt/sources.list.d/pgdg-source.list* /tmp
  - sudo apt-get -qq purge postgis* postgresql*
  - sudo rm -Rf /var/lib/postgresql /etc/postgresql
  - sudo apt-add-repository --yes ppa:cartodb/postgresql-9.5
  - sudo apt-add-repository --yes ppa:cartodb/gis
  - sudo apt-get update
-  - sudo apt-get install -q postgresql-9.5-postgis-2.2
-  - sudo apt-get install -q postgresql-plpython-9.5
+  - sudo apt-get install -q --force-yes postgresql-9.5-postgis-2.2 postgresql-plpython-9.5
  - echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.5/main/pg_hba.conf
  - sudo service postgresql restart
  - createdb template_postgis
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,29 @@
 # Changelog

+## 2.70.0
+
+Released 2016-08-16
+
+Announcements:
+ - Upgrades camshaft to [0.40.0](https://github.com/CartoDB/camshaft/releases/tag/0.40.0).
+
+
+## 2.69.1
+
+Released 2016-08-12
+
+Announcements:
+ - Upgrades windshaft to [2.4.2](https://github.com/CartoDB/camshaft/releases/tag/2.4.2).
+
+
+## 2.69.0
+
+Released 2016-08-11
+
+Announcements:
+ - Upgrades camshaft to [0.39.0](https://github.com/CartoDB/camshaft/releases/tag/0.39.0).
+
+
 ## 2.68.0

 Released 2016-07-21
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -62,6 +62,7 @@ var config = {
        extent: "-180,-90,180,90",
        srid: 4326,
        */
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        simplify_geometries: true,
        use_overviews: true, // use overviews to retrieve raster
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -56,6 +56,7 @@ var config = {
        host: '127.0.0.1',
        port: 6432,
        extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        /*
         * Set persist_connection to false if you want
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -56,6 +56,7 @@ var config = {
        host: '127.0.0.1',
        port: 6432,
        extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        simplify_geometries: true,
        use_overviews: true, // use overviews to retrieve raster
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -56,6 +56,7 @@ var config = {
        host: '127.0.0.1',
        port: 5432,
        extent: "-20037508.3,-20037508.3,20037508.3,20037508.3",
+        // max number of rows to return when querying data, 0 means no limit
        row_limit: 65535,
        simplify_geometries: true,
        use_overviews: true, // use overviews to retrieve raster
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.68.0",
+  "version": "2.70.0",
  "dependencies": {
    "body-parser": {
      "version": "1.14.2",
@@ -105,9 +105,9 @@
      }
    },
    "camshaft": {
-      "version": "0.38.1",
-      "from": "camshaft@0.38.1",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.38.1.tgz",
+      "version": "0.40.0",
+      "from": "camshaft@0.40.0",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.40.0.tgz",
      "dependencies": {
        "async": {
          "version": "1.5.2",
@@ -115,9 +115,9 @@
          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
        },
        "request": {
-          "version": "2.73.0",
+          "version": "2.74.0",
          "from": "request@>=2.69.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.73.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
          "dependencies": {
            "aws-sign2": {
              "version": "0.6.0",
@@ -376,9 +376,9 @@
                  }
                },
                "sshpk": {
-                  "version": "1.8.3",
+                  "version": "1.9.2",
                  "from": "sshpk@>=1.7.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
+                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz",
                  "dependencies": {
                    "asn1": {
                      "version": "0.2.3",
@@ -472,9 +472,9 @@
              "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
            },
            "tough-cookie": {
-              "version": "2.2.2",
-              "from": "tough-cookie@>=2.2.0 <2.3.0",
-              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
+              "version": "2.3.1",
+              "from": "tough-cookie@>=2.3.0 <2.4.0",
+              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"
            },
            "tunnel-agent": {
              "version": "0.4.3",
@@ -612,7 +612,7 @@
          "dependencies": {
            "unpipe": {
              "version": "1.0.0",
-              "from": "unpipe@1.0.0",
+              "from": "unpipe@>=1.0.0 <1.1.0",
              "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
            }
          }
@@ -1019,9 +1019,9 @@
          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
        },
        "tough-cookie": {
-          "version": "2.3.0",
+          "version": "2.3.1",
          "from": "tough-cookie@>=0.12.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.0.tgz"
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"
        },
        "http-signature": {
          "version": "0.11.0",
@@ -1282,19 +1282,19 @@
      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
    },
    "windshaft": {
-      "version": "2.4.0",
-      "from": "windshaft@2.4.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.4.0.tgz",
+      "version": "2.4.2",
+      "from": "windshaft@2.4.2",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-2.4.2.tgz",
      "dependencies": {
        "abaculus": {
-          "version": "1.1.0-cdb5",
-          "from": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb5",
-          "resolved": "https://github.com/CartoDB/abaculus/tarball/1.1.0-cdb5"
+          "version": "1.1.0-cdb7",
+          "from": "cartodb/abaculus#1.1.0-cdb7",
+          "resolved": "git://github.com/cartodb/abaculus.git#49e73cf3dbc023af5cb575dffb09384907dc7ed1"
        },
        "canvas": {
          "version": "1.2.7-cdb1",
-          "from": "https://github.com/CartoDB/node-canvas/tarball/1.2.7-cdb1",
-          "resolved": "https://github.com/CartoDB/node-canvas/tarball/1.2.7-cdb1",
+          "from": "cartodb/node-canvas#1.2.7-cdb1",
+          "resolved": "git://github.com/cartodb/node-canvas.git#f17f99d1bf757c230cda2169f1b4a94fd6eff97d",
          "dependencies": {
            "nan": {
              "version": "1.9.0",
@@ -1305,8 +1305,8 @@
        },
        "carto": {
          "version": "0.15.1-cdb1",
-          "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
-          "resolved": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
+          "from": "cartodb/carto#0.15.1-cdb2",
+          "resolved": "git://github.com/cartodb/carto.git#673cf381215948269827052afa152e485b01e2f0",
          "dependencies": {
            "mapnik-reference": {
              "version": "6.0.5",
@@ -2980,16 +2980,16 @@
                      "from": "aws4@>=1.2.1 <2.0.0",
                      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
                    },
-                    "block-stream": {
-                      "version": "0.0.9",
-                      "from": "block-stream@*",
-                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
-                    },
                    "balanced-match": {
                      "version": "0.4.1",
                      "from": "balanced-match@>=0.4.1 <0.5.0",
                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz"
                    },
+                    "block-stream": {
+                      "version": "0.0.9",
+                      "from": "block-stream@*",
+                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
+                    },
                    "boom": {
                      "version": "2.10.1",
                      "from": "boom@>=2.0.0 <3.0.0",
@@ -3040,30 +3040,35 @@
                      "from": "debug@>=2.2.0 <2.3.0",
                      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
                    },
-                    "deep-extend": {
-                      "version": "0.4.1",
-                      "from": "deep-extend@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
-                    },
                    "delayed-stream": {
                      "version": "1.0.0",
                      "from": "delayed-stream@>=1.0.0 <1.1.0",
                      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
                    },
+                    "deep-extend": {
+                      "version": "0.4.1",
+                      "from": "deep-extend@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
+                    },
                    "delegates": {
                      "version": "1.0.0",
                      "from": "delegates@>=1.0.0 <2.0.0",
                      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
                    },
+                    "ecc-jsbn": {
+                      "version": "0.1.1",
+                      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                    },
                    "escape-string-regexp": {
                      "version": "1.0.5",
                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
                    },
-                    "ecc-jsbn": {
-                      "version": "0.1.1",
-                      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+                    "extend": {
+                      "version": "3.0.0",
+                      "from": "extend@>=3.0.0 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
                    },
                    "extsprintf": {
                      "version": "1.0.2",
@@ -3090,16 +3095,16 @@
                      "from": "fstream-ignore@>=1.0.3 <1.1.0",
                      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.4.tgz"
                    },
-                    "gauge": {
-                      "version": "1.2.7",
-                      "from": "gauge@>=1.2.5 <1.3.0",
-                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
-                    },
                    "generate-function": {
                      "version": "2.0.0",
                      "from": "generate-function@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
                    },
+                    "gauge": {
+                      "version": "1.2.7",
+                      "from": "gauge@>=1.2.5 <1.3.0",
+                      "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
+                    },
                    "generate-object-property": {
                      "version": "1.2.0",
                      "from": "generate-object-property@>=1.1.0 <2.0.0",
@@ -3125,36 +3130,51 @@
                      "from": "har-validator@>=2.0.6 <2.1.0",
                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
                    },
-                    "hawk": {
-                      "version": "3.1.3",
-                      "from": "hawk@>=3.1.3 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
+                    "has-ansi": {
+                      "version": "2.0.0",
+                      "from": "has-ansi@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
                    },
                    "has-unicode": {
                      "version": "2.0.0",
                      "from": "has-unicode@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz"
                    },
+                    "hawk": {
+                      "version": "3.1.3",
+                      "from": "hawk@>=3.1.3 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
+                    },
                    "hoek": {
                      "version": "2.16.3",
                      "from": "hoek@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                    },
-                    "inflight": {
-                      "version": "1.0.4",
-                      "from": "inflight@>=1.0.4 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
-                    },
                    "http-signature": {
                      "version": "1.1.1",
                      "from": "http-signature@>=1.1.0 <1.2.0",
                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
                    },
+                    "inflight": {
+                      "version": "1.0.4",
+                      "from": "inflight@>=1.0.4 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
+                    },
+                    "inherits": {
+                      "version": "2.0.1",
+                      "from": "inherits@>=2.0.1 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                    },
                    "ini": {
                      "version": "1.3.4",
                      "from": "ini@>=1.3.0 <1.4.0",
                      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
                    },
+                    "is-my-json-valid": {
+                      "version": "2.13.1",
+                      "from": "is-my-json-valid@>=2.12.4 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
+                    },
                    "is-property": {
                      "version": "1.0.2",
                      "from": "is-property@>=1.0.0 <2.0.0",
@@ -3175,11 +3195,6 @@
                      "from": "isstream@>=0.1.2 <0.2.0",
                      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
                    },
-                    "inherits": {
-                      "version": "2.0.1",
-                      "from": "inherits@>=2.0.1 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
-                    },
                    "jodid25519": {
                      "version": "1.0.2",
                      "from": "jodid25519@>=1.0.0 <2.0.0",
@@ -3190,11 +3205,6 @@
                      "from": "jsbn@>=0.1.0 <0.2.0",
                      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
                    },
-                    "has-ansi": {
-                      "version": "2.0.0",
-                      "from": "has-ansi@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-                    },
                    "json-schema": {
                      "version": "0.2.2",
                      "from": "json-schema@0.2.2",
@@ -3205,21 +3215,16 @@
                      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
                      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
                    },
-                    "extend": {
-                      "version": "3.0.0",
-                      "from": "extend@>=3.0.0 <3.1.0",
-                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                    "jsprim": {
+                      "version": "1.2.2",
+                      "from": "jsprim@>=1.2.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
                    },
                    "jsonpointer": {
                      "version": "2.0.0",
                      "from": "jsonpointer@2.0.0",
                      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
                    },
-                    "jsprim": {
-                      "version": "1.2.2",
-                      "from": "jsprim@>=1.2.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
-                    },
                    "lodash._baseslice": {
                      "version": "4.0.0",
                      "from": "lodash._baseslice@>=4.0.0 <4.1.0",
@@ -3230,21 +3235,26 @@
                      "from": "lodash._basetostring@>=4.12.0 <4.13.0",
                      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
                    },
+                    "lodash.pad": {
+                      "version": "4.4.0",
+                      "from": "lodash.pad@>=4.1.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.4.0.tgz"
+                    },
                    "lodash.padend": {
                      "version": "4.5.0",
                      "from": "lodash.padend@>=4.1.0 <5.0.0",
                      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.5.0.tgz"
                    },
-                    "lodash.tostring": {
-                      "version": "4.1.3",
-                      "from": "lodash.tostring@>=4.0.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.3.tgz"
-                    },
                    "lodash.padstart": {
                      "version": "4.5.0",
                      "from": "lodash.padstart@>=4.1.0 <5.0.0",
                      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.5.0.tgz"
                    },
+                    "lodash.tostring": {
+                      "version": "4.1.3",
+                      "from": "lodash.tostring@>=4.0.0 <5.0.0",
+                      "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.3.tgz"
+                    },
                    "mime-db": {
                      "version": "1.23.0",
                      "from": "mime-db@>=1.23.0 <1.24.0",
@@ -3320,10 +3330,10 @@
                      "from": "process-nextick-args@>=1.0.6 <1.1.0",
                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
                    },
-                    "is-my-json-valid": {
-                      "version": "2.13.1",
-                      "from": "is-my-json-valid@>=2.12.4 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
+                    "qs": {
+                      "version": "6.1.0",
+                      "from": "qs@>=6.1.0 <6.2.0",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"
                    },
                    "readable-stream": {
                      "version": "2.1.2",
@@ -3410,11 +3420,6 @@
                      "from": "verror@1.3.6",
                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
                    },
-                    "lodash.pad": {
-                      "version": "4.4.0",
-                      "from": "lodash.pad@>=4.1.0 <5.0.0",
-                      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.4.0.tgz"
-                    },
                    "wrappy": {
                      "version": "1.0.1",
                      "from": "wrappy@>=1.0.0 <2.0.0",
@@ -3425,11 +3430,6 @@
                      "from": "xtend@>=4.0.0 <5.0.0",
                      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
                    },
-                    "qs": {
-                      "version": "6.1.0",
-                      "from": "qs@>=6.1.0 <6.2.0",
-                      "resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"
-                    },
                    "bl": {
                      "version": "1.1.2",
                      "from": "bl@>=1.1.2 <1.2.0",
@@ -3543,9 +3543,9 @@
          }
        },
        "mapnik": {
-          "version": "1.4.15-cdb8",
-          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb8",
-          "resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb8",
+          "version": "1.4.15-cdb10",
+          "from": "https://s3.amazonaws.com/cartodb-node-binary/mapnik/v1.4.15-cdb10/1.4.15-cdb10.tgz",
+          "resolved": "https://s3.amazonaws.com/cartodb-node-binary/mapnik/v1.4.15-cdb10/1.4.15-cdb10.tgz",
          "dependencies": {
            "nan": {
              "version": "1.2.0",
@@ -3962,14 +3962,14 @@
          }
        },
        "tilelive-bridge": {
-          "version": "1.3.0-cdb5",
-          "from": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb5",
-          "resolved": "https://github.com/CartoDB/tilelive-bridge/tarball/1.3.0-cdb5",
+          "version": "1.3.0-cdb7",
+          "from": "cartodb/tilelive-bridge#1.3.0-cdb7",
+          "resolved": "git://github.com/cartodb/tilelive-bridge.git#36e4dc3b1bd8094ebc1da6446509a6f5334a3cc9",
          "dependencies": {
            "mapnik-pool": {
-              "version": "0.1.1-cdb5",
-              "from": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb5",
-              "resolved": "https://github.com/CartoDB/mapnik-pool/tarball/0.1.1-cdb5",
+              "version": "0.1.1-cdb7",
+              "from": "cartodb/mapnik-pool#0.1.1-cdb7",
+              "resolved": "git://github.com/cartodb/mapnik-pool.git#2d5c709d1351aa583e6e6138a2a08aba5da287c4",
              "dependencies": {
                "generic-pool": {
                  "version": "2.1.1",
@@ -3986,9 +3986,9 @@
          }
        },
        "tilelive-mapnik": {
-          "version": "0.6.15-cdb7",
-          "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb7",
-          "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/0.6.15-cdb7",
+          "version": "0.6.15-cdb9",
+          "from": "cartodb/tilelive-mapnik#0.6.15-cdb9",
+          "resolved": "git://github.com/cartodb/tilelive-mapnik.git#925067ed5537d73b5e6cc6067f2708172a774a42",
          "dependencies": {
            "generic-pool": {
              "version": "2.1.1",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.68.0",
+  "version": "2.70.0",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,7 +20,7 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.38.1",
+    "camshaft": "0.40.0",
    "cartodb-psql": "~0.6.1",
    "cartodb-query-tables": "~0.1.0",
    "cartodb-redis": "0.13.1",
@@ -39,7 +39,7 @@
    "step-profiler": "~0.3.0",
    "turbo-carto": "0.16.0",
    "underscore": "~1.6.0",
-    "windshaft": "2.4.0"
+    "windshaft": "2.4.2"
  },
  "devDependencies": {
    "istanbul": "~0.4.3",
Author	SHA1	Message	Date
Raul Ochoa	44b6f4be7e	Release 2.70.0	2016-08-16 12:24:23 +02:00
Raul Ochoa	280be1751c	Merge pull request #565 from CartoDB/update-camshaft Upgrade camshaft to 0.40.0	2016-08-16 12:19:25 +02:00
Raul Ochoa	701a73a2c5	Upgrade camshaft to 0.40.0	2016-08-16 11:33:32 +02:00
Raul Ochoa	b578eada07	Stubs next version	2016-08-12 10:34:33 +02:00
Raul Ochoa	8100f155dc	Release 2.69.1	2016-08-12 10:33:10 +02:00
Raul Ochoa	9f1a014004	Upgrades windshaft to 2.4.2	2016-08-12 10:24:06 +02:00
Raul Ochoa	e35e0e157c	Stubs next version	2016-08-11 12:06:33 +02:00
Raul Ochoa	3aff328af3	Release 2.69.0	2016-08-11 12:05:56 +02:00
Raul Ochoa	ffb086045a	Bump version	2016-08-11 12:05:37 +02:00
Raul Ochoa	c0786dfa6f	Merge pull request #564 from CartoDB/fix-travis Avoid 'No such file or directory'	2016-08-10 12:59:29 +02:00
Raul Ochoa	ddc33fa52b	Avoid 'No such file or directory'	2016-08-10 10:30:04 +02:00
Raul Ochoa	9f2d6a5d41	Merge pull request #563 from CartoDB/upgrade-camshaft Upgrade camshaft to 0.39.0	2016-08-09 17:01:09 +02:00
Raul Ochoa	64e884a092	force-yes for postgresql-plpython-9.5	2016-08-09 15:45:21 +02:00
Raul Ochoa	17ec174683	Use --force-yes	2016-08-09 15:41:17 +02:00
Raul Ochoa	3666cbee94	Upgrade camshaft to 0.39.0	2016-08-09 15:29:54 +02:00
Raul Ochoa	25de018f7d	Add comment about row_limit config parameter	2016-08-01 12:59:38 +02:00
Raul Ochoa	6597851b48	Stubs next version	2016-07-21 21:04:39 +02:00