Repository: hadoop Updated Branches: refs/heads/branch-2 2ce7659bf -> bae1ec5f2
MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview. (Siqi Li via gera) (cherry picked from commit e8302071ff16247a3d0cfc2dcca02da1bbf4db18) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bae1ec5f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bae1ec5f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bae1ec5f Branch: refs/heads/branch-2 Commit: bae1ec5f294b6981bd2bc913d65850a939b2451a Parents: 2ce7659 Author: Gera Shegalov <[email protected]> Authored: Wed Jun 3 23:41:07 2015 -0700 Committer: Gera Shegalov <[email protected]> Committed: Wed Jun 3 23:52:16 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bae1ec5f/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index de60b9b..cf40293 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -186,6 +186,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/bae1ec5f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java ---------------------------------------------------------------------- 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 f3341a6..dbd1dee 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) {
