Repository: hadoop
Updated Branches:
  refs/heads/branch-2 c27a5ba65 -> 7b3c64aec


YARN-7608. Incorrect sTarget column causing DataTable warning on RM application 
and scheduler web page. Contributed by Gergely Novák.


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

Branch: refs/heads/branch-2
Commit: 7b3c64aeceaf3a8fa6927bd069705ccc4527346d
Parents: c27a5ba
Author: Weiwei Yang <[email protected]>
Authored: Mon Dec 11 10:31:46 2017 +0800
Committer: Weiwei Yang <[email protected]>
Committed: Mon Dec 11 13:06:13 2017 +0800

----------------------------------------------------------------------
 .../java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7b3c64ae/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
index 3a26ae5..29f1e63 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
@@ -55,9 +55,9 @@ public class WebPageUtils {
       .append(", 'mRender': renderHadoopDate }")
       .append("\n, {'sType':'numeric', bSearchable:false, 'aTargets':");
     if (isFairSchedulerPage) {
-      sb.append("[13]");
-    } else if (isResourceManager) {
       sb.append("[15]");
+    } else if (isResourceManager) {
+      sb.append("[17]");
     } else {
       sb.append("[9]");
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to