This is an automated email from the ASF dual-hosted git repository. jeongyoon pushed a commit to branch 717-TGE in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git
commit 2460c09c50e87b2c43a454d59ff603f744b06374 Author: Jeongyoon Eo <[email protected]> AuthorDate: Sun Mar 4 14:57:06 2018 +0900 minor fix --- .../src/main/java/edu/snu/nemo/runtime/executor/TaskGroupExecutor.java | 2 +- .../main/java/edu/snu/nemo/runtime/executor/TaskGroupStateManager.java | 1 + .../src/main/java/edu/snu/nemo/runtime/master/BlockManagerMaster.java | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupExecutor.java b/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupExecutor.java index cbc12e9..85d58ee 100644 --- a/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupExecutor.java +++ b/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupExecutor.java @@ -775,4 +775,4 @@ public final class TaskGroupExecutor { } } } -} \ No newline at end of file +} diff --git a/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupStateManager.java b/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupStateManager.java index e35eadc..81ed432 100644 --- a/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupStateManager.java +++ b/runtime/executor/src/main/java/edu/snu/nemo/runtime/executor/TaskGroupStateManager.java @@ -19,6 +19,7 @@ import edu.snu.nemo.common.dag.DAG; import edu.snu.nemo.common.exception.UnknownExecutionStateException; import edu.snu.nemo.common.exception.UnknownFailureCauseException; import edu.snu.nemo.runtime.common.RuntimeIdGenerator; +import edu.snu.nemo.runtime.common.comm.ControlMessage; import edu.snu.nemo.runtime.common.message.MessageEnvironment; import edu.snu.nemo.runtime.common.message.PersistentConnectionToMasterMap; import edu.snu.nemo.runtime.common.plan.RuntimeEdge; diff --git a/runtime/master/src/main/java/edu/snu/nemo/runtime/master/BlockManagerMaster.java b/runtime/master/src/main/java/edu/snu/nemo/runtime/master/BlockManagerMaster.java index 31ed98f..0651b9b 100644 --- a/runtime/master/src/main/java/edu/snu/nemo/runtime/master/BlockManagerMaster.java +++ b/runtime/master/src/main/java/edu/snu/nemo/runtime/master/BlockManagerMaster.java @@ -16,9 +16,9 @@ package edu.snu.nemo.runtime.master; import edu.snu.nemo.common.exception.IllegalMessageException; +import edu.snu.nemo.runtime.common.comm.ControlMessage; import edu.snu.nemo.runtime.common.exception.AbsentBlockException; import edu.snu.nemo.runtime.common.RuntimeIdGenerator; -import edu.snu.nemo.runtime.common.comm.ControlMessage; import edu.snu.nemo.runtime.common.message.MessageContext; import edu.snu.nemo.runtime.common.message.MessageEnvironment; import edu.snu.nemo.runtime.common.message.MessageListener; @@ -435,5 +435,4 @@ public final class BlockManagerMaster { return locationFuture; } } ->>>>>>> master } -- To stop receiving notification emails like this one, please contact [email protected].
