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

Merge pull request #578 from CartoDB/upgrade-turbo-carto

Browse Source 
Upgrades turbo-carto to 0.18.0
This commit is contained in:
Raul Ochoa 2016-10-11 16:53:39 +02:00 committed by GitHub
commit f7ea2bb51e
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -7,6 +7,7 @@ New features:
- Retrieve analysis limits and pass them into camshaft.
Announcements:
- Upgrades turbo-carto to [0.18.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.18.0).
- Upgrades camshaft to [0.45.0](https://github.com/CartoDB/camshaft/releases/tag/0.45.0).

6
lib/cartodb/backends/analysis.js
View File

@ -24,11 +24,7 @@ AnalysisBackend.prototype.setBatchConfig = function (options) {
};
AnalysisBackend.prototype.setLoggerConfig = function (options) {
var loggerConfig = options || {};
loggerConfig.filename = loggerConfig.filename;
this.loggerConfig = loggerConfig;
this.loggerConfig = options || {};
if (this.loggerConfig.filename) {
this.stream = fs.createWriteStream(this.loggerConfig.filename, { flags: 'a', encoding: 'utf8' });

15
npm-shrinkwrap.json generated
View File

@ -80,7 +80,7 @@
},
"type-is": {
"version": "1.6.13",
"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.13.tgz",
"dependencies": {
"media-typer": {
@ -90,7 +90,7 @@
},
"mime-types": {
"version": "2.1.12",
"from": "mime-types@>=2.1.11 <2.2.0",
"from": "mime-types@>=2.1.2 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
"dependencies": {
"mime-db": {
@ -685,7 +685,7 @@
"dependencies": {
"mime-types": {
"version": "2.1.12",
"from": "mime-types@>=2.1.6 <2.2.0",
"from": "mime-types@>=2.1.11 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
"dependencies": {
"mime-db": {
@ -915,7 +915,7 @@
},
"mime-types": {
"version": "2.1.12",
"from": "mime-types@>=2.1.6 <2.2.0",
"from": "mime-types@>=2.1.11 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
"dependencies": {
"mime-db": {
@ -1137,7 +1137,7 @@
},
"mime-types": {
"version": "2.1.12",
"from": "mime-types@>=2.1.11 <2.2.0",
"from": "mime-types@>=2.1.2 <2.2.0",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz",
"dependencies": {
"mime-db": {
@ -1365,9 +1365,8 @@
"resolved": "https://registry.npmjs.org/step-profiler/-/step-profiler-0.3.0.tgz"
},
"turbo-carto": {
"version": "0.17.1",
"from": "turbo-carto@0.17.1",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.17.1.tgz",
"version": "0.18.0",
"from": "turbo-carto@0.18.0",
"dependencies": {
"colorbrewer": {
"version": "1.0.0",

2
package.json
View File

@ -37,7 +37,7 @@
"request": "~2.62.0",
"step": "~0.0.6",
"step-profiler": "~0.3.0",
"turbo-carto": "0.17.1",
"turbo-carto": "0.18.0",
"underscore": "~1.6.0",
"windshaft": "2.5.0",
"yargs": "~5.0.0"