From 24dcbbc524924873880021eae767e124624a476d Mon Sep 17 00:00:00 2001
From: Mahadev Konar <mahadev@apache.org>
Date: Fri, 9 Dec 2011 02:01:22 +0000
Subject: [PATCH] MAPREDUCE-3513. Capacity Scheduler web UI has a spelling
 mistake for Memory. (chackaravarthy via mahadev) - Merging r1212215 from
 trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212216 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                        | 3 +++
 .../hadoop/yarn/server/nodemanager/webapp/NodePage.java     | 2 +-
 .../server/resourcemanager/webapp/MetricsOverviewTable.java | 6 +-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 424dcd24c7c..f117c4599fc 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -206,6 +206,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3327. RM web ui scheduler link doesn't show correct max value 
     for queues (Anupam Seth via mahadev)
 
+    MAPREDUCE-3513. Capacity Scheduler web UI has a spelling mistake for Memory.
+    (chackaravarthy via mahadev)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java
index 064525e7394..93201237de5 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/NodePage.java
@@ -71,7 +71,7 @@ public class NodePage extends NMView {
                 this.context.getNodeHealthStatus().getLastHealthReportTime()))
           ._("NodeHealthReport",
               this.context.getNodeHealthStatus().getHealthReport())
-          ._("Node Manger Version:", YarnVersionInfo.getBuildVersion() +
+          ._("Node Manager Version:", YarnVersionInfo.getBuildVersion() +
               " on " + YarnVersionInfo.getDate())
           ._("Hadoop Version:", VersionInfo.getBuildVersion() +
               " on " + VersionInfo.getDate());
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.java
index dd2644eb3fa..3b916a599c7 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.java
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/MetricsOverviewTable.java
@@ -18,14 +18,10 @@
 
 package org.apache.hadoop.yarn.server.resourcemanager.webapp;
 
-import java.util.concurrent.ConcurrentMap;
-
 import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.yarn.api.records.NodeId;
 import org.apache.hadoop.yarn.server.resourcemanager.ClusterMetrics;
 import org.apache.hadoop.yarn.server.resourcemanager.RMContext;
 import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
-import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
 import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
@@ -85,7 +81,7 @@ public class MetricsOverviewTable extends HtmlBlock {
         th().$class("ui-state-default")._("Apps Submitted")._().
         th().$class("ui-state-default")._("Containers Running")._().
         th().$class("ui-state-default")._("Memory Used")._().
-        th().$class("ui-state-default")._("Memopry Total")._().
+        th().$class("ui-state-default")._("Memory Total")._().
         th().$class("ui-state-default")._("Memory Reserved")._().
         th().$class("ui-state-default")._("Total Nodes")._().
         th().$class("ui-state-default")._("Decommissioned Nodes")._().