diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f720c85a..34df19c6 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.1.9", + "version": "1.1.10", "dependencies": { "cluster2": { "version": "0.3.5-cdb02", @@ -32,7 +32,7 @@ "version": "0.8.3" }, "npm": { - "version": "1.2.16", + "version": "1.2.17", "dependencies": { "semver": { "version": "1.1.4" @@ -178,6 +178,9 @@ }, "chmodr": { "version": "0.1.0" + }, + "cmd-shim": { + "version": "1.1.0" } } } @@ -190,7 +193,7 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.11.1", + "version": "0.11.2", "dependencies": { "grainstore": { "version": "0.12.0", @@ -219,11 +222,8 @@ "millstone": { "version": "0.5.15", "dependencies": { - "generic-pool": { - "version": "2.0.3" - }, "request": { - "version": "2.12.0", + "version": "2.11.4", "dependencies": { "form-data": { "version": "0.0.3", @@ -291,7 +291,7 @@ "version": "4.3.3", "dependencies": { "optimist": { - "version": "0.3.5", + "version": "0.3.7", "dependencies": { "wordwrap": { "version": "0.0.2" diff --git a/package.json b/package.json index 9320ce10..e4c9d945 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production", "node-varnish": "0.1.1", "underscore" : "~1.3.3", - "windshaft" : "~0.11.1", + "windshaft" : "~0.11.2", "step": "0.0.x", "generic-pool": "~1.0.12", "redis": "0.7.2", diff --git a/run_tests.sh b/run_tests.sh index 394f5ad5..7b6385f1 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -77,5 +77,8 @@ PATH=node_modules/.bin/:$PATH echo "Running tests" mocha -u tdd ${TESTS} +ret=$? cleanup + +exit $ret