hadoop git commit: MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu. (cherry picked from commit 790a861766dcd60212d83f444f2f96d3acf20a94)

2015-11-18 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 1b0f277ea -> b96377334


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/b9637733
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b9637733
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b9637733

Branch: refs/heads/branch-2.7
Commit: b96377334c29bef135c41f7b2215ab23e1c08920
Parents: 1b0f277
Author: Jason Lowe 
Authored: Wed Nov 18 17:12:50 2015 +
Committer: Jason Lowe 
Committed: Wed Nov 18 17:12:50 2015 +

--
 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/b9637733/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index fffcf5b..85306ef 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -17,6 +17,9 @@ Release 2.7.3 - UNRELEASED
 MAPREDUCE-5485. Allow repeating job commit by extending OutputCommitter 
API. 
 (Junping Du via jianhe)
 
+MAPREDUCE-6377. JHS sorting on state column not working in webUi.
+(zhihai xu via devaraj)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b9637733/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();
   }

hadoop git commit: MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu. (cherry picked from commit 790a861766dcd60212d83f444f2f96d3acf20a94)

2015-11-18 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 866d0f6f0 -> 937d9653a


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/937d9653
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/937d9653
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/937d9653

Branch: refs/heads/branch-2.6
Commit: 937d9653a76c5596fc61fbdfc95a999835a116ff
Parents: 866d0f6
Author: Jason Lowe 
Authored: Wed Nov 18 17:17:58 2015 +
Committer: Jason Lowe 
Committed: Wed Nov 18 17:17:58 2015 +

--
 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/937d9653/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 7d513a8..b80039e 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -21,6 +21,9 @@ Release 2.6.3 - UNRELEASED
 
 MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee)
 
+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/937d9653/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();
   }

[32/50] hadoop git commit: MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu.

2015-06-08 Thread zjshen 
MAPREDUCE-6377. JHS sorting on state column not working in webUi.
Contributed by zhihai xu.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c8f7f173
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c8f7f173
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c8f7f173

Branch: refs/heads/YARN-2928
Commit: c8f7f173778206e3aab05fe30572426bc6ae4001
Parents: 42ba35b
Author: Devaraj K deva...@apache.org
Authored: Fri Jun 5 15:50:16 2015 +0530
Committer: Zhijie Shen zjs...@apache.org
Committed: Mon Jun 8 09:56:58 2015 -0700

--
 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/c8f7f173/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 391303e..d78fb9c 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -474,6 +474,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview.
 (Siqi Li via gera)
 
+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/c8f7f173/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();
   }

hadoop git commit: MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu.

2015-06-05 Thread devaraj 
Repository: hadoop
Updated Branches:
  refs/heads/trunk b2540f486 - 790a86176


MAPREDUCE-6377. JHS sorting on state column not working in webUi.
Contributed by zhihai xu.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/790a8617
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/790a8617
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/790a8617

Branch: refs/heads/trunk
Commit: 790a861766dcd60212d83f444f2f96d3acf20a94
Parents: b2540f4
Author: Devaraj K deva...@apache.org
Authored: Fri Jun 5 15:50:16 2015 +0530
Committer: Devaraj K deva...@apache.org
Committed: Fri Jun 5 15:50:16 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/790a8617/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index fd40ad2..2ffa541 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -450,6 +450,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6382. Don't escape HTML links in Diagnostics in JHS job overview.
 (Siqi Li via gera)
 
+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/790a8617/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();
   }

hadoop git commit: MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu.

2015-06-05 Thread devaraj 
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 deva...@apache.org
Authored: Fri Jun 5 15:50:16 2015 +0530
Committer: Devaraj K deva...@apache.org
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();
   }