From e8302071ff16247a3d0cfc2dcca02da1bbf4db18 Mon Sep 17 00:00:00 2001 From: Gera Shegalov Date: Wed, 3 Jun 2015 23:41:07 -0700 Subject: [PATCH] MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview. (Siqi Li via gera) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ccb2f975a89..fd40ad29f9e 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -447,6 +447,9 @@ Release 2.8.0 - UNRELEASED high. Error is: "error=7, Argument list too long at if number of input file is high" (wilfreds via rkanter) + MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview. + (Siqi Li via gera) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java index f3341a68587..dbd1dee1f80 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java @@ -101,7 +101,7 @@ public class HsJobBlock extends HtmlBlock { for(String diag: diagnostics) { b.append(addTaskLinks(diag)); } - infoBlock._("Diagnostics:", b.toString()); + infoBlock._r("Diagnostics:", b.toString()); } if(job.getNumMaps() > 0) {