cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/staging' into develop

Browse Source
This commit is contained in:
Luis Bosque 2013-04-04 14:25:43 +02:00
commit bc068a5463
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
npm-shrinkwrap.json generated
View File

@ -185,8 +185,8 @@
} }
}, },
"pg": { "pg": {
"version": "0.12.3-cdb1", "version": "0.12.3-cdb2",
"from": "git://github.com/CartoDB/node-postgres.git#cdb_production" "from": "git://github.com/CartoDB/node-postgres.git#cdb-0.12.3-cdb2"
}, },
"generic-pool": { "generic-pool": {
"version": "2.0.3" "version": "2.0.3"

2
package.json
View File

@ -13,7 +13,7 @@
"express": "~2.5.11", "express": "~2.5.11",
"underscore" : "1.1.x", "underscore" : "1.1.x",
"underscore.string": "1.1.5", "underscore.string": "1.1.5",
"pg": "git://github.com/CartoDB/node-postgres.git#cdb_production", "pg": "git://github.com/CartoDB/node-postgres.git#cdb-0.12.3-cdb2",
"express": "~2.5.11", "express": "~2.5.11",
"generic-pool": "~2.0.2", "generic-pool": "~2.0.2",
"redis": "0.7.1", "redis": "0.7.1",