Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE0D1107C5 for ; Fri, 5 Jun 2015 10:35:26 +0000 (UTC) Received: (qmail 31908 invoked by uid 500); 5 Jun 2015 10:35:26 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 31842 invoked by uid 500); 5 Jun 2015 10:35:26 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 31833 invoked by uid 99); 5 Jun 2015 10:35:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jun 2015 10:35:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5BC43E041E; Fri, 5 Jun 2015 10:35:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devaraj@apache.org To: common-commits@hadoop.apache.org Message-Id: <1c10dfe15eeb4138a22e5560343d0f58@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: MAPREDUCE-6377. JHS sorting on state column not working in webUi. Contributed by zhihai xu. Date: Fri, 5 Jun 2015 10:35:26 +0000 (UTC) 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 Authored: Fri Jun 5 15:50:16 2015 +0530 Committer: Devaraj K 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(); }