From dbe7e29f0a4a1c7d1bf378e9bf76e7c1811a5f72 Mon Sep 17 00:00:00 2001 From: Brandon Li Date: Thu, 13 Feb 2014 23:57:19 +0000 Subject: [PATCH] HDFS-5901. Merging change r1568168 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568169 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html | 4 ++-- .../hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js | 2 +- .../hadoop-hdfs/src/main/webapps/hdfs/explorer.html | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5c29398ab50..3dc53a4ba98 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -105,6 +105,9 @@ Release 2.4.0 - UNRELEASED HDFS-5934. New Namenode UI back button doesn't work as expected (Travis Thompson via brandonli) + HDFS-5901. NameNode new UI doesn't support IE8 and IE9 on windows 7 + (Vinayakumar B via brandonli) + Release 2.3.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html index 461031a7937..90667716424 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html @@ -1,3 +1,5 @@ + - diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js index 3ab21548f58..39450043cda 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.js @@ -28,7 +28,7 @@ {"name": "nn", "url": "/jmx?qry=Hadoop:service=NameNode,name=NameNodeInfo"}, {"name": "nnstat", "url": "/jmx?qry=Hadoop:service=NameNode,name=NameNodeStatus"}, {"name": "fs", "url": "/jmx?qry=Hadoop:service=NameNode,name=FSNamesystemState"}, - {"name": "mem", "url": "/jmx?qry=java.lang:type=Memory"}, + {"name": "mem", "url": "/jmx?qry=java.lang:type=Memory"} ]; var HELPERS = { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html index 50c7dfe46b4..f9c339748f9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html @@ -1,3 +1,5 @@ + -