Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r 1332231:1332232 from trunk. FIXES: MAPREDUCE-4206 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332235 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-04-30 15:08:30 +00:00
parent f17cf45efe
commit 41ce1fa860
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -318,6 +318,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing
scope test (Radim Kolar via bobby)
MAPREDUCE-4206. Sorting by Last Health-Update on the RM nodes page sorts
does not work correctly (Jonathon Eagles via tgraves)
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES

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

@ -121,7 +121,8 @@ class NodesPage extends RmView {
row.td().a("http://" + httpAddress, httpAddress)._();
}
row.td(info.getHealthStatus()).
td(Times.format(info.getLastHealthUpdate())).
td().br().$title(String.valueOf(info.getLastHealthUpdate()))._().
_(Times.format(info.getLastHealthUpdate()))._().
td(info.getHealthReport()).
td(String.valueOf(info.getNumContainers())).
td().br().$title(String.valueOf(usedMemory))._().
@ -153,10 +154,12 @@ class NodesPage extends RmView {
}
private String nodesTableInit() {
StringBuilder b = tableInit().append(",aoColumnDefs:[");
b.append("{'bSearchable':false, 'aTargets': [7]} ,");
b.append("{'sType':'title-numeric', 'bSearchable':false, " +
"'aTargets': [ 8, 9] }]}");
StringBuilder b = tableInit().append(", aoColumnDefs: [");
b.append("{'bSearchable': false, 'aTargets': [ 7 ]}");
b.append(", {'sType': 'title-numeric', 'bSearchable': false, " +
"'aTargets': [ 8, 9 ] }");
b.append(", {'sType': 'title-numeric', 'aTargets': [ 5 ]}");
b.append("]}");
return b.toString();
}
}