From cde65024a20d660e586494ec6a443f8732fee068 Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Fri, 31 Aug 2012 19:28:21 +0000 Subject: [PATCH] YARN-60: Fix minor merge conflict (bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379558 13f79535-47bb-0310-9956-ffa450edef68 --- .../yarn/server/resourcemanager/TestRMNodeTransitions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java index 2b2decccb6b..f9ba80cb971 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java @@ -200,7 +200,7 @@ public class TestRMNodeTransitions { private RMNodeImpl getRunningNode() { NodeId nodeId = BuilderUtils.newNodeId("localhost", 0); RMNodeImpl node = new RMNodeImpl(nodeId, rmContext,null, 0, 0, - null, null, null); + null, null); node.handle(new RMNodeEvent(node.getNodeID(), RMNodeEventType.STARTED)); Assert.assertEquals(NodeState.RUNNING, node.getState()); return node; @@ -212,7 +212,7 @@ public class TestRMNodeTransitions { status.setHealthReport("sick"); status.setIsNodeHealthy(false); node.handle(new RMNodeStatusEvent(node.getNodeID(), status, - new ArrayList(), null, null, null)); + new ArrayList(), null, null)); Assert.assertEquals(NodeState.UNHEALTHY, node.getState()); return node; }