Merge branch 'master' into fix-error-context

2016-06-29 19:02:54 +02:00
parent a36c1c52ae 84c67f977e
commit ed7f95a1a7
8 changed files with 502 additions and 211 deletions
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.50.1",
+  "version": "2.53.6",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,7 +20,7 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.19.0",
+    "camshaft": "0.22.4",
    "cartodb-psql": "~0.6.1",
    "cartodb-query-tables": "~0.1.0",
    "cartodb-redis": "~0.13.0",