Merge branch 'master' into one-redis-mpool

This commit is contained in:
Raul Ochoa
2014-10-14 18:23:17 +02:00
10 changed files with 1065 additions and 409 deletions
+6 -2
View File
@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "1.18.1",
"version": "1.19.1",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@@ -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.28.0",
"windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.28.2",
"step": "~0.0.5",
"request": "~2.9.203",
"cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",
@@ -43,5 +43,9 @@
},
"scripts": {
"test": "make check"
},
"engines": {
"node": ">=0.8 <0.11",
"npm": ">=1.2.1"
}
}