You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2016/01/13 23:29:39 UTC
[11/17] hadoop git commit: MAPREDUCE-6377. JHS sorting on state
column not working in webUi. Contributed by zhihai xu. (cherry picked from
commit 790a861766dcd60212d83f444f2f96d3acf20a94)
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
(cherry picked from commit b96377334c29bef135c41f7b2215ab23e1c08920)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ad829ffe
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ad829ffe
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ad829ffe
Branch: refs/heads/branch-2.7.2
Commit: ad829ffe44cbc891cea394fdf5406269178703d8
Parents: 10f23dc
Author: Jason Lowe <jl...@apache.org>
Authored: Wed Nov 18 17:12:50 2015 +0000
Committer: Vinod Kumar Vavilapalli (I am also known as @tshooter.) <vi...@apache.org>
Committed: Wed Jan 13 11:44:07 2016 -0800
----------------------------------------------------------------------
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/ad829ffe/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 9d7b043..d216d4b 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -297,6 +297,9 @@ Release 2.6.3 - UNRELEASED
MAPREDUCE-5883. "Total megabyte-seconds" in job counters is slightly
misleading (Nathan Roberts via jlowe)
+ MAPREDUCE-6377. JHS sorting on state column not working in webUi.
+ (zhihai xu via devaraj)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad829ffe/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();
}