You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/12/23 20:22:44 UTC
[25/52] [abbrv] flink git commit: Rebase fixes
Rebase fixes
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/57762350
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/57762350
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/57762350
Branch: refs/heads/master
Commit: 57762350f5baa731d93f87da5e7182d41550c9ca
Parents: d8b22e0
Author: Till Rohrmann <tr...@apache.org>
Authored: Mon Oct 31 19:01:22 2016 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Dec 23 20:54:25 2016 +0100
----------------------------------------------------------------------
.../apache/flink/runtime/instance/SlotDescriptor.java | 4 ++--
.../apache/flink/runtime/taskexecutor/TaskExecutor.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/57762350/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotDescriptor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotDescriptor.java
index 360cc26..47ce422 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotDescriptor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/instance/SlotDescriptor.java
@@ -53,13 +53,13 @@ public class SlotDescriptor {
final TaskManagerLocation location,
final int slotNumber,
final ResourceProfile resourceProfile,
- final TaskManagerGateway actorGateway)
+ final TaskManagerGateway taskManagerGateway)
{
this.jobID = checkNotNull(jobID);
this.taskManagerLocation = checkNotNull(location);
this.slotNumber = slotNumber;
this.resourceProfile = checkNotNull(resourceProfile);
- this.taskManagerGateway = checkNotNull(actorGateway);
+ this.taskManagerGateway = checkNotNull(taskManagerGateway);
}
public SlotDescriptor(final SlotDescriptor other) {
http://git-wip-us.apache.org/repos/asf/flink/blob/57762350/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
index b981829..c94113c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java
@@ -883,12 +883,12 @@ public class TaskExecutor extends RpcEndpoint<TaskExecutorGateway> {
jobMasterLeaderId,
jobMasterGateway,
new TaskExecutionState(
- task.getJobID(),
- task.getExecutionId(),
- task.getExecutionState(),
- task.getFailureCause(),
- accumulatorSnapshot,
- task.getMetricGroup().getIOMetricGroup().createSnapshot()));
+ task.getJobID(),
+ task.getExecutionId(),
+ task.getExecutionState(),
+ task.getFailureCause(),
+ accumulatorSnapshot,
+ task.getMetricGroup().getIOMetricGroup().createSnapshot()));
} else {
log.error("Cannot find task with ID {} to unregister.", executionAttemptID);
}