You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/07/07 04:45:49 UTC
beam git commit: Fix bad merge
Repository: beam
Updated Branches:
refs/heads/master 17d7e5980 -> 17bc3b140
Fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/17bc3b14
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/17bc3b14
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/17bc3b14
Branch: refs/heads/master
Commit: 17bc3b140c7c7315880ce18d4e15d6ac512c35d2
Parents: 17d7e59
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Jul 6 21:45:39 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Thu Jul 6 21:45:39 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/beam/runners/dataflow/TransformTranslator.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/17bc3b14/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java
index 7f61b6c..06ed1e0 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/TransformTranslator.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.beam.runners.dataflow.options.DataflowPipelineOptions;
import org.apache.beam.runners.dataflow.util.OutputReference;
import org.apache.beam.sdk.Pipeline;
+import org.apache.beam.sdk.annotations.Internal;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.runners.AppliedPTransform;
import org.apache.beam.sdk.transforms.PTransform;