Repository: hadoop Updated Branches: refs/heads/branch-3.0 4f5853338 -> 13310f91a
YARN-7132. FairScheduler.initScheduler() contains a surprising unary plus. (Yeliang Cang via Haibo Chen) (cherry picked from commit fa531788fd7c9eee70808818a2f6aec9bdc3bec7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/13310f91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/13310f91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/13310f91 Branch: refs/heads/branch-3.0 Commit: 13310f91a561d73f901f497507db43c1402d3038 Parents: 4f58533 Author: Haibo Chen <haiboc...@apache.org> Authored: Mon Sep 11 20:42:49 2017 -0700 Committer: Haibo Chen <haiboc...@apache.org> Committed: Mon Sep 11 20:49:33 2017 -0700 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/scheduler/fair/FairScheduler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/13310f91/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.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/scheduler/fair/FairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java index c521250..2292e3d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java @@ -1320,7 +1320,7 @@ public class FairScheduler extends updateInterval = FairSchedulerConfiguration.DEFAULT_UPDATE_INTERVAL_MS; LOG.warn(FairSchedulerConfiguration.UPDATE_INTERVAL_MS + " is invalid, so using default value " - + +FairSchedulerConfiguration.DEFAULT_UPDATE_INTERVAL_MS + + FairSchedulerConfiguration.DEFAULT_UPDATE_INTERVAL_MS + " ms instead"); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
