hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject hadoop git commit: YARN-2906. CapacitySchedulerPage shows HTML tags for a queue's Active Users. Contributed by Jason Lowe (cherry picked from commit 8a7ca13b13c0c3f008a6490cc96d4d48a051d1f7)
Date Fri, 28 Aug 2015 02:11:41 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6.1 7f97189bc -> 888ab4a6e


YARN-2906. CapacitySchedulerPage shows HTML tags for a queue's Active Users. Contributed by
Jason Lowe
(cherry picked from commit 8a7ca13b13c0c3f008a6490cc96d4d48a051d1f7)

(cherry picked from commit ae35b0e14d3438237f4b5d3b5d5268d45e549846)
(cherry picked from commit 65acee3e19a147e5c5a8688319ab75357bdf51b5)


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

Branch: refs/heads/branch-2.6.1
Commit: 888ab4a6e782f9fa3a39fc084888bcaa1bfa103f
Parents: 7f97189
Author: Jian He <jianhe@apache.org>
Authored: Tue Nov 25 16:16:56 2014 -0800
Committer: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Committed: Thu Aug 27 19:10:43 2015 -0700

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                                  | 3 +++
 .../server/resourcemanager/webapp/CapacitySchedulerPage.java     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/888ab4a6/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 700101c..382383d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -24,6 +24,9 @@ Release 2.6.1 - UNRELEASED
     YARN-2865. Fixed RM to always create a new RMContext when transtions from
     StandBy to Active. (Rohith Sharmaks via jianhe)
 
+    YARN-2906. CapacitySchedulerPage shows HTML tags for a queue's Active Users.
+    (Jason Lowe via jianhe)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/888ab4a6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
index d289f66..89b4a78 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
@@ -120,8 +120,8 @@ class CapacitySchedulerPage extends RmView {
           _("Configured Max Capacity:", percent(lqinfo.getMaxCapacity() / 100)).
           _("Configured Minimum User Limit Percent:", Integer.toString(lqinfo.getUserLimit())
+ "%").
           _("Configured User Limit Factor:", String.format("%.1f", lqinfo.getUserLimitFactor())).
-          _("Active Users: ", activeUserList.toString()).
-          _r("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels()));
+          _r("Active Users: ", activeUserList.toString()).
+          _("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels()));
 
       html._(InfoBlock.class);
 


Mime
View raw message