[beam] 01/01: Merge pull request #6398: [BEAM-5385] Flink job server to use REST port from --flink-master-url instead of default.

[th...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

thw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 41aaf778a78c68834be5c476555124210a721afe
Merge: 9b85316 84a571e
Author: Thomas Weise <tw...@users.noreply.github.com>
AuthorDate: Fri Sep 14 13:49:33 2018 -0700

    Merge pull request #6398: [BEAM-5385] Flink job server to use REST port from --flink-master-url instead of default.

 .../org/apache/beam/runners/flink/FlinkExecutionEnvironments.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --cc runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkExecutionEnvironments.java
index 853d4f3,9d16f3f..b5a1c8a
--- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkExecutionEnvironments.java
+++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkExecutionEnvironments.java
@@@ -19,9 -19,10 +19,11 @@@ package org.apache.beam.runners.flink
  
  import com.google.common.base.Splitter;
  import java.util.List;
 +import org.apache.flink.api.common.ExecutionConfig;
  import org.apache.flink.api.java.CollectionEnvironment;
  import org.apache.flink.api.java.ExecutionEnvironment;
+ import org.apache.flink.configuration.Configuration;
+ import org.apache.flink.configuration.RestOptions;
  import org.apache.flink.runtime.state.AbstractStateBackend;
  import org.apache.flink.streaming.api.TimeCharacteristic;
  import org.apache.flink.streaming.api.environment.CheckpointConfig.ExternalizedCheckpointCleanup;