cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into CDB-3686

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Raul Ochoa
2014-08-13 15:31:22 +02:00
parent 8255f3eb51 d1fb792709
commit f2541d8cae
8 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+5 -5
View File
@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "1.14.1",
"version": "1.15.1",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@@ -24,12 +24,12 @@
"dependencies": {
"node-varnish": "http://github.com/Vizzuality/node-varnish/tarball/0.3.0",
"underscore" : "~1.3.3",
"windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.23.0",
"step": "0.0.x",
"windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.24.0",
"step": "~0.0.5",
"request": "2.9.202",
"cartodb-redis": "git://github.com/CartoDB/node-cartodb-redis.git#0.5.0",
"cartodb-redis": "git://github.com/CartoDB/node-cartodb-redis.git#0.9.0",
"cartodb-psql": "git://github.com/CartoDB/node-cartodb-psql.git#0.3.1",
"redis-mpool": "http://github.com/CartoDB/node-redis-mpool/tarball/0.0.4",
"redis-mpool": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
"mapnik": "http://github.com/Vizzuality/node-mapnik/tarball/0.7.26-cdb1",
"lzma": "~1.2.3",
"log4js": "~0.6.10",