hadoop git commit: YARN-4109. Exception on RM scheduler page loading with labels. (Mohammad Shahid Khan via rohithsharmaks)

[shv]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 42c2d36ba -> 0a4d8f658


YARN-4109. Exception on RM scheduler page loading with labels. (Mohammad Shahid 
Khan via rohithsharmaks)

(cherry picked from commit 8c180a13c82ab9d60f595e6942e35d51024dab53)

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

Branch: refs/heads/branch-2.7
Commit: 0a4d8f658432c6350343700470c4334497c095c4
Parents: 42c2d36
Author: rohithsharmaks <rohithsharm...@apache.org>
Authored: Wed Dec 23 09:12:32 2015 +0530
Committer: Konstantin V Shvachko <s...@apache.org>
Committed: Thu May 18 17:26:30 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a4d8f65/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c7fc556..25ce86e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -11,6 +11,9 @@ Release 2.7.4 - UNRELEASED
     YARN-6457. Allow custom SSL configuration to be supplied in WebApps.
     (Sanjay M Pujare via haibochen)
 
+    YARN-4109. Exception on RM scheduler page loading with labels.
+    (Mohammad Shahid Khan via rohithsharmaks)
+
   OPTIMIZATIONS
 
     YARN-5262. Optimize sending RMNodeFinishedContainersPulledByAMEvent for

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a4d8f65/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 cf4dc1f..844910d 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
@@ -327,7 +327,7 @@ class CapacitySchedulerPage extends RmView {
                   used > 1 ? Q_OVER : Q_UNDER))._(".")._().
               span(".q", partitionUiTag)._().
             span().$class("qstats").$style(left(Q_STATS_POS)).
-              _(join(percent(used), " used"))._();
+              _(join(percent(used), " used"))._()._();
 
             //for the queue hierarchy under label
             UL<Hamlet> underLabel = html.ul("#pq");


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org