Compare commits

...

13 Commits

Author SHA1 Message Date
Raul Ochoa
03778c370c Release 2.91.2 2017-04-24 19:35:23 +02:00
Raul Ochoa
7812af8ff9 Bump version and update news 2017-04-24 19:34:52 +02:00
Raul Ochoa
f599346138 Fix release version 2017-04-24 19:34:08 +02:00
Raul Ochoa
eb8f6095b0 Merge pull request #672 from CartoDB/upgrade-deps-010
Upgrade deps, target grainstore 1.6.3
2017-04-24 19:29:41 +02:00
Raul Ochoa
30d5d43d2c Upgrade deps, target grainstore 1.6.3 2017-04-24 19:20:03 +02:00
Raul Ochoa
f354aaf500 Merge pull request #669 from CartoDB/upgrade-camshaft-010
Upgrades camshaft to 0.54.1
2017-04-24 14:36:41 +02:00
Raul Ochoa
167639ddb9 Upgrades camshaft to 0.54.1 2017-04-24 14:22:06 +02:00
Raul Ochoa
57281ad0ce Ignore errors when removing npm-shrinkwrap.json 2017-04-24 12:41:33 +02:00
Raul Ochoa
7e7e14766e Merge pull request #667 from CartoDB/upgrade-camshaft-010
Upgrades camshaft to 0.54.0
2017-04-20 18:40:39 +02:00
Raul Ochoa
7bd7a05f3c Upgrades camshaft to 0.54.0 2017-04-20 18:34:23 +02:00
Daniel García Aubert
c503548db6 Stubs next version 2017-04-11 19:31:20 +02:00
Daniel García Aubert
93537f7473 Merge tag '2.90.1' into v2.x
2.90.1
Released 2017-04-11

Announcements:
 - Upgrades camshaft to [0.53.1](https://github.com/CartoDB/camshaft/releases/tag/0.53.1)
2017-04-11 19:30:13 +02:00
Daniel
f13463d350 Merge pull request #663 from CartoDB/upgrade-camshaft-to-0.53.1-v2.x
Upgrade camshaft to 0.53.1
2017-04-11 18:48:32 +02:00
4 changed files with 80 additions and 62 deletions

View File

@@ -10,7 +10,7 @@ clean:
rm -rf node_modules/
shrinkwrap: clean
rm npm-shrinkwrap.json
-rm npm-shrinkwrap.json
npm install --no-shrinkwrap --production
npm prune
npm shrinkwrap

22
NEWS.md
View File

@@ -1,6 +1,26 @@
# Changelog
## 2.90.1
## 2.91.2
Released 2017-04-24
Announcements:
- Upgrades grainstore to [1.6.3](https://github.com/CartoDB/grainstore/releases/tag/1.6.3).
## 2.91.1
Released 2017-04-24
Announcements:
- Upgrades camshaft to [0.54.1](https://github.com/CartoDB/camshaft/releases/tag/0.54.1).
## 2.91.0
Released 2017-04-11
Announcements:
- Upgrades camshaft to [0.54.0](https://github.com/CartoDB/camshaft/releases/tag/0.54.0).
## 2.90.2
Released 2017-04-11
Announcements:

114
npm-shrinkwrap.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.90.1",
"version": "2.91.2",
"dependencies": {
"body-parser": {
"version": "1.14.2",
@@ -80,7 +80,7 @@
},
"type-is": {
"version": "1.6.15",
"from": "type-is@>=1.6.10 <1.7.0",
"from": "type-is@>=1.6.6 <1.7.0",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
"dependencies": {
"media-typer": {
@@ -105,9 +105,8 @@
}
},
"camshaft": {
"version": "0.53.1",
"from": "camshaft@0.53.1",
"resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.53.1.tgz",
"version": "0.54.1",
"from": "camshaft@0.54.1",
"dependencies": {
"async": {
"version": "1.5.2",
@@ -125,9 +124,9 @@
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz",
"dependencies": {
"nan": {
"version": "2.6.1",
"version": "2.6.2",
"from": "nan@>=2.0.8 <3.0.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.1.tgz"
"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"
}
}
},
@@ -182,7 +181,7 @@
},
"minimatch": {
"version": "3.0.3",
"from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
"from": "minimatch@>=3.0.2 <4.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
"dependencies": {
"brace-expansion": {
@@ -267,9 +266,9 @@
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz"
},
"pg-pool": {
"version": "1.7.0",
"version": "1.7.1",
"from": "pg-pool@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.7.0.tgz",
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-1.7.1.tgz",
"dependencies": {
"generic-pool": {
"version": "2.4.3",
@@ -743,9 +742,9 @@
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
},
"nan": {
"version": "2.6.1",
"version": "2.6.2",
"from": "nan@>=2.3.4 <3.0.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.1.tgz"
"resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"
}
}
}
@@ -981,9 +980,9 @@
}
},
"sshpk": {
"version": "1.11.0",
"version": "1.13.0",
"from": "sshpk@>=1.7.0 <2.0.0",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
"dependencies": {
"asn1": {
"version": "0.2.3",
@@ -1051,7 +1050,7 @@
},
"mime-types": {
"version": "2.1.15",
"from": "mime-types@>=2.1.7 <2.2.0",
"from": "mime-types@>=2.1.15 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
"dependencies": {
"mime-db": {
@@ -1223,9 +1222,8 @@
}
},
"grainstore": {
"version": "1.6.2",
"version": "1.6.3",
"from": "grainstore@>=1.6.0 <1.7.0",
"resolved": "https://registry.npmjs.org/grainstore/-/grainstore-1.6.2.tgz",
"dependencies": {
"carto": {
"version": "0.16.3",
@@ -1439,14 +1437,14 @@
}
},
"normalize-package-data": {
"version": "2.3.6",
"version": "2.3.8",
"from": "normalize-package-data@>=2.3.2 <3.0.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
"dependencies": {
"hosted-git-info": {
"version": "2.4.1",
"version": "2.4.2",
"from": "hosted-git-info@>=2.1.4 <3.0.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"
},
"is-builtin-module": {
"version": "1.0.0",
@@ -1683,9 +1681,9 @@
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz",
"dependencies": {
"are-we-there-yet": {
"version": "1.1.2",
"version": "1.1.4",
"from": "are-we-there-yet@>=1.1.2 <1.2.0",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
"dependencies": {
"delegates": {
"version": "1.0.0",
@@ -1694,7 +1692,7 @@
},
"readable-stream": {
"version": "2.2.9",
"from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
"from": "readable-stream@>=2.0.6 <3.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
"dependencies": {
"buffer-shims": {
@@ -1742,9 +1740,9 @@
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
},
"gauge": {
"version": "2.7.3",
"version": "2.7.4",
"from": "gauge@>=2.7.1 <2.8.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"dependencies": {
"aproba": {
"version": "1.1.1",
@@ -1903,9 +1901,9 @@
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
"dependencies": {
"ajv": {
"version": "4.11.6",
"version": "4.11.7",
"from": "ajv@>=4.9.1 <5.0.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.7.tgz",
"dependencies": {
"co": {
"version": "4.6.0",
@@ -1998,9 +1996,9 @@
}
},
"sshpk": {
"version": "1.11.0",
"version": "1.13.0",
"from": "sshpk@>=1.7.0 <2.0.0",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
"dependencies": {
"asn1": {
"version": "0.2.3",
@@ -2161,7 +2159,7 @@
},
"minimatch": {
"version": "3.0.3",
"from": "minimatch@>=3.0.2 <4.0.0",
"from": "minimatch@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
"dependencies": {
"brace-expansion": {
@@ -2221,7 +2219,7 @@
},
"fstream": {
"version": "1.0.11",
"from": "fstream@>=1.0.2 <2.0.0",
"from": "fstream@>=1.0.10 <2.0.0",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
"dependencies": {
"graceful-fs": {
@@ -2244,14 +2242,14 @@
"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
"dependencies": {
"debug": {
"version": "2.6.3",
"version": "2.6.4",
"from": "debug@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz",
"dependencies": {
"ms": {
"version": "0.7.2",
"from": "ms@0.7.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
"version": "0.7.3",
"from": "ms@0.7.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"
}
}
},
@@ -3218,9 +3216,9 @@
}
},
"postcss": {
"version": "5.2.16",
"version": "5.2.17",
"from": "postcss@>=5.2.8 <5.3.0",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.16.tgz",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
"dependencies": {
"chalk": {
"version": "1.1.3",
@@ -3814,7 +3812,7 @@
"dependencies": {
"strip-ansi": {
"version": "3.0.1",
"from": "strip-ansi@>=3.0.0 <4.0.0",
"from": "strip-ansi@>=3.0.1 <4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"dependencies": {
"ansi-regex": {
@@ -3960,14 +3958,14 @@
}
},
"normalize-package-data": {
"version": "2.3.6",
"version": "2.3.8",
"from": "normalize-package-data@>=2.3.2 <3.0.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
"dependencies": {
"hosted-git-info": {
"version": "2.4.1",
"version": "2.4.2",
"from": "hosted-git-info@>=2.1.4 <3.0.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"
},
"is-builtin-module": {
"version": "1.0.0",
@@ -4084,7 +4082,7 @@
},
"strip-ansi": {
"version": "3.0.1",
"from": "strip-ansi@>=3.0.0 <4.0.0",
"from": "strip-ansi@>=3.0.1 <4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"dependencies": {
"ansi-regex": {
@@ -4187,9 +4185,9 @@
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz",
"dependencies": {
"are-we-there-yet": {
"version": "1.1.2",
"version": "1.1.4",
"from": "are-we-there-yet@>=1.1.2 <1.2.0",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
"dependencies": {
"delegates": {
"version": "1.0.0",
@@ -4198,7 +4196,7 @@
},
"readable-stream": {
"version": "2.2.9",
"from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
"from": "readable-stream@>=2.0.6 <3.0.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
"dependencies": {
"buffer-shims": {
@@ -4246,9 +4244,9 @@
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
},
"gauge": {
"version": "2.7.3",
"version": "2.7.4",
"from": "gauge@>=2.7.1 <2.8.0",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"dependencies": {
"aproba": {
"version": "1.1.1",
@@ -4407,9 +4405,9 @@
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
"dependencies": {
"ajv": {
"version": "4.11.6",
"version": "4.11.7",
"from": "ajv@>=4.9.1 <5.0.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.7.tgz",
"dependencies": {
"co": {
"version": "4.6.0",
@@ -4502,9 +4500,9 @@
}
},
"sshpk": {
"version": "1.11.0",
"version": "1.13.0",
"from": "sshpk@>=1.7.0 <2.0.0",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
"dependencies": {
"asn1": {
"version": "0.2.3",
@@ -4665,7 +4663,7 @@
},
"minimatch": {
"version": "3.0.3",
"from": "minimatch@>=3.0.0 <4.0.0",
"from": "minimatch@>=3.0.2 <4.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
"dependencies": {
"brace-expansion": {
@@ -4749,7 +4747,7 @@
"dependencies": {
"fstream": {
"version": "1.0.11",
"from": "fstream@>=1.0.10 <2.0.0",
"from": "fstream@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
"dependencies": {
"graceful-fs": {
@@ -4776,7 +4774,7 @@
},
"minimatch": {
"version": "3.0.3",
"from": "minimatch@>=3.0.0 <4.0.0",
"from": "minimatch@>=3.0.2 <4.0.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
"dependencies": {
"brace-expansion": {
@@ -4834,7 +4832,7 @@
},
"inherits": {
"version": "2.0.3",
"from": "inherits@>=2.0.0 <3.0.0",
"from": "inherits@>=2.0.1 <2.1.0",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
},
"process-nextick-args": {

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.90.1",
"version": "2.91.2",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@@ -20,7 +20,7 @@
],
"dependencies": {
"body-parser": "~1.14.0",
"camshaft": "0.53.1",
"camshaft": "0.54.1",
"cartodb-psql": "~0.7.1",
"cartodb-query-tables": "~0.1.0",
"cartodb-redis": "0.13.1",