Merge -r 1166854:1166856 from trunk to branch-0.23 to fix MAPREDUCE-2844.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1166858 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -1220,6 +1220,9 @@ Release 0.23.0 - Unreleased
    MAPREDUCE-2947. Fixed race condition in AuxiliaryServices. (vinodkv via
    acmurthy) 
 
+   MAPREDUCE-2844. Fixed display of nodes in UI. (Ravi Teja Ch N V via
+   acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java

@@ -52,8 +52,8 @@ class NodesPage extends RmView {
           thead().
           tr().
           th(".rack", "Rack").
-          th(".nodeid", "Node ID").
-          th(".host", "Host").
+          th(".nodeaddress", "Node Address").
+          th(".nodehttpaddress", "Node HTTP Address").
           th(".healthStatus", "Health-status").
           th(".lastHealthUpdate", "Last health-update").
           th(".healthReport", "Health-report").