hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject hadoop git commit: MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview. (Siqi Li via gera)
Date Thu, 04 Jun 2015 06:51:21 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 1bb79c9d0 -> e8302071f


MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview. (Siqi Li via gera)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e8302071
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e8302071
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e8302071

Branch: refs/heads/trunk
Commit: e8302071ff16247a3d0cfc2dcca02da1bbf4db18
Parents: 1bb79c9
Author: Gera Shegalov <gera@apache.org>
Authored: Wed Jun 3 23:41:07 2015 -0700
Committer: Gera Shegalov <gera@apache.org>
Committed: Wed Jun 3 23:46:06 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/e8302071/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index ccb2f97..fd40ad2 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e8302071/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) {


Mime
View raw message