Fix deadlock on layergroup post

Required upgrading windshaft to 0.12.5.
Took the chance to also upgrade redis dependency to latest stable.
This commit is contained in:
Sandro Santilli 2013-06-12 18:31:38 +02:00
parent c07616f889
commit 3d4af14315
3 changed files with 131 additions and 23 deletions

View File

@ -1,5 +1,6 @@
1.3.1
------
* Fix deadlock on new style creation
1.3.0
------

149
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "1.3.0",
"version": "1.3.1",
"dependencies": {
"cluster2": {
"version": "0.3.5-cdb02",
@ -13,7 +13,7 @@
"version": "1.9.2",
"dependencies": {
"formidable": {
"version": "1.0.13"
"version": "1.0.14"
}
}
},
@ -29,10 +29,10 @@
}
},
"ejs": {
"version": "0.8.3"
"version": "0.8.4"
},
"npm": {
"version": "1.2.17",
"version": "1.2.28",
"dependencies": {
"semver": {
"version": "1.1.4"
@ -41,16 +41,16 @@
"version": "1.1.0"
},
"slide": {
"version": "1.1.3"
"version": "1.1.4"
},
"abbrev": {
"version": "1.0.4"
},
"graceful-fs": {
"version": "1.2.0"
"version": "1.2.1"
},
"minimatch": {
"version": "0.2.11",
"version": "0.2.12",
"dependencies": {
"sigmund": {
"version": "1.0.0"
@ -64,8 +64,93 @@
"version": "2.1.4"
},
"request": {
"version": "2.9.203",
"from": "git://github.com/isaacs/request"
"version": "2.21.0",
"dependencies": {
"qs": {
"version": "0.6.5"
},
"json-stringify-safe": {
"version": "4.0.0"
},
"forever-agent": {
"version": "0.5.0"
},
"tunnel-agent": {
"version": "0.3.0"
},
"http-signature": {
"version": "0.9.11",
"dependencies": {
"assert-plus": {
"version": "0.1.2"
},
"asn1": {
"version": "0.1.11"
},
"ctype": {
"version": "0.5.2"
}
}
},
"hawk": {
"version": "0.13.1",
"dependencies": {
"hoek": {
"version": "0.8.5"
},
"boom": {
"version": "0.4.2",
"dependencies": {
"hoek": {
"version": "0.9.1"
}
}
},
"cryptiles": {
"version": "0.2.1"
},
"sntp": {
"version": "0.2.4",
"dependencies": {
"hoek": {
"version": "0.9.1"
}
}
}
}
},
"aws-sign": {
"version": "0.3.0"
},
"oauth-sign": {
"version": "0.3.0"
},
"cookie-jar": {
"version": "0.3.0"
},
"node-uuid": {
"version": "1.4.0"
},
"mime": {
"version": "1.2.9"
},
"form-data": {
"version": "0.0.8",
"dependencies": {
"combined-stream": {
"version": "0.0.4",
"dependencies": {
"delayed-stream": {
"version": "0.0.5"
}
}
},
"async": {
"version": "0.2.9"
}
}
}
}
},
"which": {
"version": "1.0.5"
@ -98,7 +183,7 @@
"version": "2.3.0"
},
"node-gyp": {
"version": "0.9.5"
"version": "0.10.0"
},
"fstream-npm": {
"version": "0.1.4",
@ -124,24 +209,34 @@
"version": "0.1.2"
},
"npm-registry-client": {
"version": "0.2.18",
"version": "0.2.24",
"dependencies": {
"couch-login": {
"version": "0.1.15"
"version": "0.1.16"
}
}
},
"read-package-json": {
"version": "0.3.0"
"version": "0.4.1",
"dependencies": {
"normalize-package-data": {
"version": "0.1.6",
"dependencies": {
"github-url-from-git": {
"version": "1.1.1"
}
}
}
}
},
"read-installed": {
"version": "0.1.1"
},
"glob": {
"version": "3.1.21"
"version": "3.2.1"
},
"init-package-json": {
"version": "0.0.6",
"version": "0.0.8",
"dependencies": {
"promzard": {
"version": "0.2.0"
@ -152,7 +247,7 @@
"version": "0.0.3"
},
"lockfile": {
"version": "0.3.0"
"version": "0.3.4"
},
"retry": {
"version": "0.6.0"
@ -161,10 +256,10 @@
"version": "1.1.1"
},
"npmconf": {
"version": "0.0.23",
"version": "0.1.0",
"dependencies": {
"config-chain": {
"version": "1.1.5",
"version": "1.1.7",
"dependencies": {
"proto-list": {
"version": "1.2.2"
@ -181,6 +276,18 @@
},
"cmd-shim": {
"version": "1.1.0"
},
"sha": {
"version": "1.0.1"
},
"editor": {
"version": "0.0.4"
},
"child-process-close": {
"version": "0.1.1"
},
"npm-user-validate": {
"version": "0.0.1"
}
}
}
@ -193,10 +300,10 @@
"version": "1.3.3"
},
"windshaft": {
"version": "0.12.4",
"version": "0.12.5",
"dependencies": {
"grainstore": {
"version": "0.13.3",
"version": "0.13.4",
"dependencies": {
"carto": {
"version": "0.9.3-cdb3",
@ -330,7 +437,7 @@
"version": "2.0.3"
},
"redis": {
"version": "0.7.2"
"version": "0.8.3"
},
"hiredis": {
"version": "0.1.15",

View File

@ -21,10 +21,10 @@
"cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
"node-varnish": "0.1.1",
"underscore" : "~1.3.3",
"windshaft" : "~0.12.4",
"windshaft" : "~0.12.5",
"step": "0.0.x",
"generic-pool": "~2.0.3",
"redis": "0.7.2",
"redis": "~0.8.3",
"hiredis": "~0.1.14",
"request": "2.9.202",
"mapnik": "~0.7.14",