Addendum patch for YARN-6102. (cherry picked from commit 08d5f3acf6f283694f806b0d798dc10b515136ef)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/278ca2f2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/278ca2f2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/278ca2f2 Branch: refs/heads/YARN-5355-branch-2 Commit: 278ca2f246cdc521d9ef728101cdf252b5f98c2d Parents: c602f05 Author: Sunil G <sun...@apache.org> Authored: Wed Jul 26 18:40:52 2017 +0530 Committer: Varun Saxena <varunsax...@apache.org> Committed: Fri Jul 28 22:48:38 2017 +0530 ---------------------------------------------------------------------- .../apache/hadoop/yarn/server/resourcemanager/ResourceManager.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/278ca2f2/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 d8de137..d085fbc 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 @@ -1417,7 +1417,6 @@ public class ResourceManager extends CompositeService implements Recoverable { rmContextImpl.setDispatcher(dispatcher); rmContext = rmContextImpl; - rmContext.setDispatcher(rmDispatcher); } private void setSchedulerRecoveryStartAndWaitTime(RMState state, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org