Fixing checktyle warnings during rebase
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5e1584fc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5e1584fc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5e1584fc Branch: refs/heads/YARN-5355_branch2 Commit: 5e1584fc938f282d18ccd4560d0e3a0f0118fb16 Parents: a12c8e1 Author: vrushali <vrush...@apache.org> Authored: Tue Oct 17 11:39:20 2017 -0700 Committer: vrushali <vrush...@apache.org> Committed: Tue Oct 17 11:40:05 2017 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/ResourceManager.java | 3 --- .../hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js | 4 ++-- .../src/main/webapp/app/components/donut-chart.js | 6 +++--- .../hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e1584fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.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/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 6c013c6..75c20d6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -30,9 +30,7 @@ import org.apache.hadoop.metrics2.MetricsSystem; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.metrics2.source.JvmMetrics; import org.apache.hadoop.http.HttpServer2; -import org.apache.hadoop.http.lib.StaticUserWebFilter; import org.apache.hadoop.net.NetUtils; -import org.apache.hadoop.security.AuthenticationFilterInitializer; import org.apache.hadoop.security.Groups; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; @@ -47,7 +45,6 @@ import org.apache.hadoop.util.ShutdownHookManager; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.curator.ZKCuratorManager; import org.apache.hadoop.util.VersionInfo; -import org.apache.hadoop.util.ZKUtil; import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.ApplicationId; http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e1584fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js index 05d78eb..95245bf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/bar-chart.js @@ -20,7 +20,7 @@ import Ember from 'ember'; import BaseChartComponent from 'yarn-ui/components/base-chart-component'; export default BaseChartComponent.extend({ - // data: + // data: // [{label=label1, value=value1}, ...] // ... renderBarChart: function(data, title, textWidth = 50) { @@ -120,4 +120,4 @@ export default BaseChartComponent.extend({ this.initChart(); this.draw(); } -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e1584fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js index b1e6ecf..ce26811 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/donut-chart.js @@ -25,7 +25,7 @@ export default BaseChartComponent.extend({ /* * data = [{label="xx", value=},{...}] */ - renderDonutChart: function(data, title, showLabels = false, + renderDonutChart: function(data, title, showLabels = false, middleLabel = "Total", middleValue = undefined, suffix = "") { var g = this.chart.g; var layout = this.getLayout(); @@ -184,7 +184,7 @@ export default BaseChartComponent.extend({ this.colors = ColorUtils.getColors(this.get("data").length, targets, colorTargetReverse); } - this.renderDonutChart(this.get("data"), this.get("title"), this.get("showLabels"), + this.renderDonutChart(this.get("data"), this.get("title"), this.get("showLabels"), this.get("middleLabel"), this.get("middleValue")); }, @@ -192,4 +192,4 @@ export default BaseChartComponent.extend({ this.initChart(); this.draw(); }, -}); \ No newline at end of file +}); http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e1584fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml index 43a2ea6..f2403a6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/public/crossdomain.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> - + <!-- * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
