YARN-1006. Fixed broken rendering in the Nodes list web page on the RM web UI. Contributed by Xuan Gong.

svn merge --ignore-ancestry -c 1515629 ../../trunk/


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

hadoop-yarn-project/CHANGES.txt

@@ -44,6 +44,9 @@ Release 2.1.1-beta - UNRELEASED
     YARN-643. Fixed ResourceManager to remove all tokens consistently on app
     finish. (Xuan Gong via vinodkv)
 
+    YARN-1006. Fixed broken rendering in the Nodes list web page on the RM web
+    UI. (Xuan Gong via vinodkv)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES

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

@@ -155,10 +155,10 @@ class NodesPage extends RmView {
 
   private String nodesTableInit() {
     StringBuilder b = tableInit().append(", aoColumnDefs: [");
-    b.append("{'bSearchable': false, 'aTargets': [ 7 ]}");
+    b.append("{'bSearchable': false, 'aTargets': [ 6 ]}");
     b.append(", {'sType': 'title-numeric', 'bSearchable': false, " +
-    		"'aTargets': [ 8, 9 ] }");
-    b.append(", {'sType': 'title-numeric', 'aTargets': [ 5 ]}");
+        "'aTargets': [ 7, 8 ] }");
+    b.append(", {'sType': 'title-numeric', 'aTargets': [ 4 ]}");
     b.append("]}");
     return b.toString();
   }