[beam] 01/01: Merge pull request #5888: [BEAM-4733] Pass pipeline options from Python portable runner to job server.

[thw]

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 930cc53c91e5f65c4ed5008da5493d8e0d787364
Merge: a8eaa1b fe9c3c5
Author: Thomas Weise <twe...@users.noreply.github.com>
AuthorDate: Mon Jul 9 21:42:55 2018 +0200

    Merge pull request #5888: [BEAM-4733] Pass pipeline options from Python 
portable runner to job server.

 .../construction/PipelineOptionsTranslation.java   | 46 ++++++++++++++++++++--
 .../PipelineOptionsTranslationTest.java            |  4 +-
 .../FlinkStreamingPortablePipelineTranslator.java  |  7 +++-
 .../streaming/ExecutableStageDoFnOperator.java     | 18 ++-------
 .../streaming/ExecutableStageDoFnOperatorTest.java | 20 +++++++++-
 .../runners/portability/portable_runner.py         |  9 ++++-
 6 files changed, 80 insertions(+), 24 deletions(-)

diff --cc 
runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperator.java
index b24c7aa,cf8e734..cc0ed88
--- 
a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperator.java
+++ 
b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperator.java
@@@ -20,9 -20,9 +20,8 @@@ package org.apache.beam.runners.flink.t
  import static org.apache.flink.util.Preconditions.checkState;
  
  import java.util.Collection;
- import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
 -import java.util.logging.Logger;
  import javax.annotation.concurrent.GuardedBy;
  import org.apache.beam.model.pipeline.v1.RunnerApi;
  import org.apache.beam.runners.core.DoFnRunner;