From b269418db4552ba13ae24888e09069297491cc36 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 30 Sep 2016 18:45:15 +0200
Subject: [PATCH 1/5] Tag logs

---
 batch/models/job_fallback.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/batch/models/job_fallback.js b/batch/models/job_fallback.js
index 83d57905..40e18d3d 100644
--- a/batch/models/job_fallback.js
+++ b/batch/models/job_fallback.js
@@ -230,6 +230,7 @@ JobFallback.prototype.log = function(logger) {
 
         var queryId = query.id;
 
+        var tag = 'query';
         if (queryId) {
             output.query_id = queryId;
 
@@ -238,10 +239,11 @@ JobFallback.prototype.log = function(logger) {
                 output.analysis = node.analysisId;
                 output.node = node.nodeId;
                 output.type = node.nodeType;
+                tag = 'analysis';
             }
         }
 
-        logger.info(output);
+        logger.info(output, tag);
     }
 
     return true;

From 857ba747d083ec70ea4ce493c447c1828956cf3d Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 30 Sep 2016 18:45:33 +0200
Subject: [PATCH 2/5] Rename

---
 batch/models/job_fallback.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/batch/models/job_fallback.js b/batch/models/job_fallback.js
index 40e18d3d..29779fd8 100644
--- a/batch/models/job_fallback.js
+++ b/batch/models/job_fallback.js
@@ -220,7 +220,7 @@ JobFallback.prototype.log = function(logger) {
     for (var i = 0; i < queries.length; i++) {
         var query = queries[i];
 
-        var output = {
+        var logEntry = {
             time: query.started_at,
             endtime: query.ended_at,
             username: this.data.user,
@@ -232,18 +232,18 @@ JobFallback.prototype.log = function(logger) {
 
         var tag = 'query';
         if (queryId) {
-            output.query_id = queryId;
+            logEntry.query_id = queryId;
 
             var node = parseQueryId(queryId);
             if (node) {
-                output.analysis = node.analysisId;
-                output.node = node.nodeId;
-                output.type = node.nodeType;
+                logEntry.analysis = node.analysisId;
+                logEntry.node = node.nodeId;
+                logEntry.type = node.nodeType;
                 tag = 'analysis';
             }
         }
 
-        logger.info(output, tag);
+        logger.info(logEntry, tag);
     }
 
     return true;

From 9099b6ae13a69fa41db36fa58933a3c9b23cd010 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 30 Sep 2016 18:46:34 +0200
Subject: [PATCH 3/5] Update news

---
 NEWS.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 868cc1fd..09b25626 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,9 @@
 1.36.1 - 2016-mm-dd
 -------------------
 
+Enhancements:
+ * Tag fallback jobs logs.
+
 
 1.36.0 - 2016-09-30
 -------------------

From eef302a0b523d0420280a757dac9c2fb42c81628 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 30 Sep 2016 18:46:54 +0200
Subject: [PATCH 4/5] Release 1.36.1

---
 NEWS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS.md b/NEWS.md
index 09b25626..b959509f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-1.36.1 - 2016-mm-dd
+1.36.1 - 2016-09-30
 -------------------
 
 Enhancements:

From ccbadf4ab4f68d6d199c5065bac906770465debc Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 30 Sep 2016 18:48:13 +0200
Subject: [PATCH 5/5] Stubs next version

---
 NEWS.md             | 4 ++++
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index b959509f..0392711e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+1.36.2 - 2016-mm-dd
+-------------------
+
+
 1.36.1 - 2016-09-30
 -------------------
 
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 06a49bb7..3291204a 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb_sql_api",
-  "version": "1.36.1",
+  "version": "1.36.2",
   "dependencies": {
     "bunyan": {
       "version": "1.8.1",
diff --git a/package.json b/package.json
index bb6ac515..ebb295f9 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "keywords": [
     "cartodb"
   ],
-  "version": "1.36.1",
+  "version": "1.36.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/CartoDB/CartoDB-SQL-API.git"