From 7352a289084416a896754a4f0c0fce757fcb3422 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 11 Oct 2016 16:01:43 +0200
Subject: [PATCH 1/2] Fix variable assigning to itself

---
 lib/cartodb/backends/analysis.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/cartodb/backends/analysis.js b/lib/cartodb/backends/analysis.js
index 6470276e..2194dd75 100644
--- a/lib/cartodb/backends/analysis.js
+++ b/lib/cartodb/backends/analysis.js
@@ -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' });

From 3e4da8ab5732a438926d57f36ded2feb8af49ca8 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Tue, 11 Oct 2016 16:41:26 +0200
Subject: [PATCH 2/2] Upgrades turbo-carto to 0.18.0

---
 NEWS.md             |  1 +
 npm-shrinkwrap.json | 15 +++++++--------
 package.json        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 03ebaea9..cf925359 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -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).
 
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index edb58c5e..59e94215 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -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",
diff --git a/package.json b/package.json
index 893d1749..3464c437 100644
--- a/package.json
+++ b/package.json
@@ -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"