Repository: hadoop
Updated Branches:
refs/heads/branch-2 320e4cc0e -> 7f075f2b7
MAPREDUCE-6377. JHS sorting on state column not working in webUi.
Contributed by zhihai xu.
(cherry picked from commit 790a861766dcd60212d83f444f2f96d3acf20a94)
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7f075f2b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7f075f2b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7f075f2b
Branch: refs/heads/branch-2
Commit: 7f075f2b7504f80f3896b82a23a786928010c819
Parents: 320e4cc
Author: Devaraj K <[email protected]>
Authored: Fri Jun 5 15:50:16 2015 +0530
Committer: Devaraj K <[email protected]>
Committed: Fri Jun 5 16:03:02 2015 +0530
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f075f2b/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index d215fc2..346d5f1 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -192,6 +192,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-5232. Add a configuration to be able to log classpath and other
system properties on mapreduce JVMs startup. (Sangjin Lee via vinodkv)
+ MAPREDUCE-6377. JHS sorting on state column not working in webUi.
+ (zhihai xu via devaraj)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f075f2b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java
index 59b7aa6..229bbb0 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsView.java
@@ -87,10 +87,11 @@ public class HsView extends TwoColumnLayout {
append(", bProcessing: true").
// Sort by id upon page load
- append(", aaSorting: [[2, 'desc']]").
+ append(", aaSorting: [[3, 'desc']]").
append(", aoColumnDefs:[").
// Maps Total, Maps Completed, Reduces Total and Reduces Completed
- append("{'sType':'numeric', 'bSearchable': false, 'aTargets': [ 7, 8,
9, 10 ] }").
+ append("{'sType':'numeric', 'bSearchable': false" +
+ ", 'aTargets': [ 8, 9, 10, 11 ] }").
append("]}").
toString();
}
