Merge branch 'master' into 230-close-logfile-fd-on-kill-hup

Conflicts: npm-shrinkwrap.json
2014-12-02 17:09:50 +01:00
parent 3b4b5ab298 873d6287c4
commit 3da2830cfa
3 changed files with 215 additions and 145 deletions
@@ -25,7 +25,7 @@
        "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
        "underscore"  : "~1.6.0",
        "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.0",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.1",
        "step": "~0.0.5",
        "request": "~2.9.203",
        "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",