Merge remote-tracking branch 'origin/master' into pete-fixes

diff --git a/apps/workbench/app/assets/javascripts/log_viewer.js b/apps/workbench/app/assets/javascripts/log_viewer.js
index 74bba133fbc87fd99f34eaff0c2b4155cfa9e90e..93681cc6d73fc7559120562f664e77c0a45d216e 100644 (file)
--- a/apps/workbench/app/assets/javascripts/log_viewer.js
+++ b/apps/workbench/app/assets/javascripts/log_viewer.js
@@ -89,7 +89,7 @@ function addToLogViewer(logViewer, lines, taskState) {
                 taskid: v11,
                 node: node,
                 slot: slot,
-                message: message,
+                message: message.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;'),
                 type: type
             });
             count += 1;