hadoop git commit: YARN-4374. RM capacity scheduler UI rounds user limit factor. Contributed by Chang Li (cherry picked from commit 060cdcbe5db56383e74e282ac61eedff8248c11b)

[jlowe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 eb9296d31 -> 9074714a1


YARN-4374. RM capacity scheduler UI rounds user limit factor. Contributed by 
Chang Li
(cherry picked from commit 060cdcbe5db56383e74e282ac61eedff8248c11b)

Conflicts:

        
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java


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

Branch: refs/heads/branch-2.7
Commit: 9074714a1859306361558db777c100f65b7c16fd
Parents: eb9296d
Author: Jason Lowe <jl...@apache.org>
Authored: Fri Nov 20 23:25:27 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri Nov 20 23:25:27 2015 +0000

----------------------------------------------------------------------
 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/9074714a/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4c552af..1fe828f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -19,6 +19,9 @@ Release 2.7.3 - UNRELEASED
 
     YARN-4347. Resource manager fails with Null pointer exception. (Jian He 
via wangda)
 
+    YARN-4374. RM capacity scheduler UI rounds user limit factor (Chang Li via
+    jlowe)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9074714a/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 e62fd70..2fcc12a 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
@@ -90,7 +90,7 @@ class CapacitySchedulerPage extends RmView {
           _("Configured Capacity:", percent(lqinfo.getCapacity() / 100)).
           _("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())).
+          _("Configured User Limit Factor:", lqinfo.getUserLimitFactor()).
           _("Accessible Node Labels:", StringUtils.join(",", 
lqinfo.getNodeLabels())).
           _("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : 
"enabled");