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 ji...@apache.org on 2014/11/26 01:18:11 UTC
hadoop git commit: YARN-2906. CapacitySchedulerPage shows HTML tags
for a queue's Active Users. Contributed by Jason Lowe (cherry picked from
commit 8a7ca13b13c0c3f008a6490cc96d4d48a051d1f7)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 8018d1af5 -> ae35b0e14
YARN-2906. CapacitySchedulerPage shows HTML tags for a queue's Active Users. Contributed by Jason Lowe
(cherry picked from commit 8a7ca13b13c0c3f008a6490cc96d4d48a051d1f7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ae35b0e1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ae35b0e1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ae35b0e1
Branch: refs/heads/branch-2
Commit: ae35b0e14d3438237f4b5d3b5d5268d45e549846
Parents: 8018d1a
Author: Jian He <ji...@apache.org>
Authored: Tue Nov 25 16:16:56 2014 -0800
Committer: Jian He <ji...@apache.org>
Committed: Tue Nov 25 16:18:02 2014 -0800
----------------------------------------------------------------------
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/ae35b0e1/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index be8fbed..29f2797 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -116,6 +116,9 @@ Release 2.7.0 - UNRELEASED
YARN-2697. Remove useless RMAuthenticationHandler. (Haosong Huang via zjshen)
+ 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/ae35b0e1/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);