Repository: flink
Updated Branches:
  refs/heads/flip-6 4076bd748 -> fdeda082f


[hotfix] fix ResourceManagerGateway


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/fdeda082
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/fdeda082
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/fdeda082

Branch: refs/heads/flip-6
Commit: fdeda082f02a3bb4d3a1c34179110345cec61c25
Parents: 4076bd7
Author: Maximilian Michels <m...@apache.org>
Authored: Thu Sep 22 13:56:00 2016 +0200
Committer: Maximilian Michels <m...@apache.org>
Committed: Thu Sep 22 13:56:39 2016 +0200

----------------------------------------------------------------------
 .../flink/runtime/resourcemanager/ResourceManagerGateway.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/fdeda082/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
----------------------------------------------------------------------
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
index d8b8ebe..484cea7 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java
@@ -27,7 +27,6 @@ import org.apache.flink.runtime.rpc.RpcTimeout;
 import org.apache.flink.runtime.jobmaster.JobMaster;
 import org.apache.flink.runtime.registration.RegistrationResponse;
 
-import org.apache.flink.runtime.registration.RegistrationResponse;
 import java.util.UUID;
 
 /**
@@ -39,6 +38,7 @@ public interface ResourceManagerGateway extends RpcGateway {
         * Register a {@link JobMaster} at the resource manager.
         *
         * @param resourceManagerLeaderId The fencing token for the 
ResourceManager leader
+        * @param jobMasterLeaderId The fencing token for the JobMaster leader
         * @param jobMasterAddress        The address of the JobMaster that 
registers
         * @param jobID                   The Job ID of the JobMaster that 
registers
         * @param timeout                 Timeout for the future to complete
@@ -46,6 +46,7 @@ public interface ResourceManagerGateway extends RpcGateway {
         */
        Future<RegistrationResponse> registerJobMaster(
                UUID resourceManagerLeaderId,
+               UUID jobMasterLeaderId,
                String jobMasterAddress,
                JobID jobID,
                @RpcTimeout Time timeout);

Reply via email to