From addb9f1e2274110dee9823ce8a193feae2ccb322 Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Fri, 22 Nov 2013 18:45:31 +0000 Subject: [PATCH] HDFS-5444. Merge change r1541753 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544634 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/webapps/hdfs/dfshealth.html | 8 ++++++-- .../src/main/webapps/hdfs/dfshealth.jsp | 6 +++--- .../src/main/webapps/hdfs/index.html | 18 +++++++++--------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index e5431d8c2d0..dbb4caa1239 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -25,6 +25,9 @@ Release 2.3.0 - UNRELEASED HDFS-3987. Support webhdfs over HTTPS. (Haohui Mai via jing9) + HDFS-5444. Choose default web UI based on browser capabilities. (Haohui Mai + via jing9) + IMPROVEMENTS HDFS-5267. Remove volatile from LightWeightHashSet. (Junping Du via llu) 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 c4c3a5a524e..0ee78739208 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 @@ -30,6 +30,12 @@
+
+
+

Hadoop, 2013.

+
Legacy UI
+
+ -
-

Hadoop, 2013.

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp index 10872a7af09..2afba913088 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.jsp @@ -70,6 +70,6 @@

Startup Progress

<% healthjsp.generateStartupProgress(out, nn.getStartupProgress()); %> -<% -out.println(ServletUtil.htmlFooter()); -%> +

Hadoop, 2013. New UI

+ + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/index.html b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/index.html index 7fc136b0c85..99bb13b326c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/index.html +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/index.html @@ -14,22 +14,22 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + + Hadoop Administration - - +

Hadoop Administration

- - -