Merge remote-tracking branch 'origin/master' into new_querytables_library

2016-02-22 15:35:36 +01:00
parent 850f1cb7f4 f78c6fbc63
commit 37fcfe69c7
7 changed files with 476 additions and 226 deletions
@@ -1,7 +1,7 @@
 {
    "private": true,
    "name": "windshaft-cartodb",
-    "version": "2.23.1",
+    "version": "2.25.2",
    "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.9.0",
+        "windshaft": "1.11.1",
        "step": "~0.0.6",
        "queue-async": "~1.0.7",
        "request": "~2.62.0",