cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into avoid-profiler-dots

Browse Source 
Conflicts:
	NEWS.md
This commit is contained in:
Raul Ochoa 2016-05-05 15:30:12 +02:00
commit d5391ef15b
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NEWS.md
View File

@ -8,6 +8,15 @@ Announcements:
- Upgrades step-profiler to 0.3.0 to avoid dots in json keys #438 - Upgrades step-profiler to 0.3.0 to avoid dots in json keys #438
## 2.38.1
Released 2016-05-05
Announcements:
- Fixes problem in turbo-carto dependency
- Removes console usages
## 2.38.0 ## 2.38.0
Released 2016-05-05 Released 2016-05-05

22
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "2.38.0", "version": "2.39.0",
"dependencies": { "dependencies": {
"body-parser": { "body-parser": {
"version": "1.14.2", "version": "1.14.2",
@ -73,14 +73,14 @@
}, },
"unpipe": { "unpipe": {
"version": "1.0.0", "version": "1.0.0",
"from": "unpipe@1.0.0", "from": "unpipe@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
} }
} }
}, },
"type-is": { "type-is": {
"version": "1.6.12", "version": "1.6.12",
"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.12.tgz", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
"dependencies": { "dependencies": {
"media-typer": { "media-typer": {
@ -667,7 +667,7 @@
"dependencies": { "dependencies": {
"unpipe": { "unpipe": {
"version": "1.0.0", "version": "1.0.0",
"from": "unpipe@1.0.0", "from": "unpipe@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
} }
} }
@ -782,7 +782,7 @@
}, },
"type-is": { "type-is": {
"version": "1.6.12", "version": "1.6.12",
"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.12.tgz", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
"dependencies": { "dependencies": {
"media-typer": { "media-typer": {
@ -1234,9 +1234,9 @@
"from": "step-profiler@>=0.3.0 <0.4.0" "from": "step-profiler@>=0.3.0 <0.4.0"
}, },
"turbo-carto": { "turbo-carto": {
"version": "0.7.0", "version": "0.7.1",
"from": "turbo-carto@0.7.0", "from": "turbo-carto@0.7.1",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.7.0.tgz", "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.7.1.tgz",
"dependencies": { "dependencies": {
"colorbrewer": { "colorbrewer": {
"version": "1.0.0", "version": "1.0.0",
@ -1244,9 +1244,9 @@
"resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz" "resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz"
}, },
"cartocolor": { "cartocolor": {
"version": "1.0.0", "version": "1.0.2",
"from": "cartocolor@1.0.0", "from": "cartocolor@1.0.2",
"resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-1.0.0.tgz" "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-1.0.2.tgz"
}, },
"es6-promise": { "es6-promise": {
"version": "3.1.2", "version": "3.1.2",

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "2.38.0", "version": "2.39.0",
"description": "A map tile server for CartoDB", "description": "A map tile server for CartoDB",
"keywords": [ "keywords": [
"cartodb" "cartodb"
@ -39,7 +39,7 @@
"lzma": "~1.3.7", "lzma": "~1.3.7",
"log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb", "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
"cartodb-query-tables": "~0.1.0", "cartodb-query-tables": "~0.1.0",
"turbo-carto": "0.7.0" "turbo-carto": "0.7.1"
}, },
"devDependencies": { "devDependencies": {
"istanbul": "~0.3.6", "istanbul": "~0.3.6",