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

Merge branch 'master' into node-v6

Browse Source
This commit is contained in:
Raul Ochoa 2016-12-19 16:22:18 +01:00
commit 7ba1ecb36c
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NEWS.md
View File

@ -1,12 +1,18 @@
#Changelog #Changelog
## 1.42.6 ## 1.42.7
Released 2016-12-12 Released 2016-mm-dd
Announcements: Announcements:
* Upgrade cartodb-psql to ?. * Upgrade cartodb-psql to ?.
* Upgrade redis-mpool to 0.4.1.
## 1.42.6
Released 2016-12-19
Announcements:
* Upgrade cartodb-redis to 0.13.2. * Upgrade cartodb-redis to 0.13.2.
* Upgrade redis-mpool to 0.4.1.
## 1.42.5 ## 1.42.5

12
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "cartodb_sql_api", "name": "cartodb_sql_api",
"version": "1.42.6", "version": "1.42.7",
"dependencies": { "dependencies": {
"accepts": { "accepts": {
"version": "1.2.13", "version": "1.2.13",
@ -159,7 +159,7 @@
}, },
"cartodb-redis": { "cartodb-redis": {
"version": "0.13.2", "version": "0.13.2",
"from": "cartodb-redis@>=0.13.2 <0.14.0", "from": "cartodb-redis@0.13.2",
"resolved": "https://registry.npmjs.org/cartodb-redis/-/cartodb-redis-0.13.2.tgz" "resolved": "https://registry.npmjs.org/cartodb-redis/-/cartodb-redis-0.13.2.tgz"
}, },
"caseless": { "caseless": {
@ -422,7 +422,8 @@
"glob": { "glob": {
"version": "6.0.4", "version": "6.0.4",
"from": "glob@>=6.0.1 <7.0.0", "from": "glob@>=6.0.1 <7.0.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz" "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
"optional": true
}, },
"graceful-fs": { "graceful-fs": {
"version": "4.1.11", "version": "4.1.11",
@ -907,7 +908,7 @@
}, },
"redis-mpool": { "redis-mpool": {
"version": "0.4.1", "version": "0.4.1",
"from": "redis-mpool@>=0.4.1 <0.5.0", "from": "redis-mpool@0.4.1",
"resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.4.1.tgz", "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.4.1.tgz",
"dependencies": { "dependencies": {
"generic-pool": { "generic-pool": {
@ -940,7 +941,8 @@
"rimraf": { "rimraf": {
"version": "2.4.5", "version": "2.4.5",
"from": "rimraf@>=2.4.0 <2.5.0", "from": "rimraf@>=2.4.0 <2.5.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz" "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
"optional": true
}, },
"safe-json-stringify": { "safe-json-stringify": {
"version": "1.0.3", "version": "1.0.3",

6
package.json
View File

@ -5,7 +5,7 @@
"keywords": [ "keywords": [
"cartodb" "cartodb"
], ],
"version": "1.42.6", "version": "1.42.7",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/CartoDB/CartoDB-SQL-API.git" "url": "git://github.com/CartoDB/CartoDB-SQL-API.git"
@ -21,7 +21,7 @@
"bunyan": "1.8.1", "bunyan": "1.8.1",
"cartodb-psql": "cartodb/node-cartodb-psql#node-v6", "cartodb-psql": "cartodb/node-cartodb-psql#node-v6",
"cartodb-query-tables": "0.2.0", "cartodb-query-tables": "0.2.0",
"cartodb-redis": "~0.13.2", "cartodb-redis": "0.13.2",
"debug": "2.2.0", "debug": "2.2.0",
"express": "~4.13.3", "express": "~4.13.3",
"log4js": "cartodb/log4js-node#cdb", "log4js": "cartodb/log4js-node#cdb",
@ -32,7 +32,7 @@
"oauth-client": "0.3.0", "oauth-client": "0.3.0",
"qs": "~6.2.1", "qs": "~6.2.1",
"queue-async": "~1.0.7", "queue-async": "~1.0.7",
"redis-mpool": "~0.4.1", "redis-mpool": "0.4.1",
"redlock": "2.0.1", "redlock": "2.0.1",
"request": "~2.75.0", "request": "~2.75.0",
"step": "~0.0.5", "step": "~0.0.5",