You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2016/07/01 05:54:28 UTC

[1/3] incubator-beam git commit: [BEAM-392] Rename missing references to FlinkPipelineRunner

Repository: incubator-beam
Updated Branches:
  refs/heads/master df1d5f61e -> b4c123cd4


[BEAM-392] Rename missing references to FlinkPipelineRunner


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

Branch: refs/heads/master
Commit: d8c01c8b5453be750c1deae123ecb8cbb9b833c2
Parents: 2d3d0f4
Author: Isma�l Mej�a <ie...@gmail.com>
Authored: Wed Jun 29 23:12:06 2016 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Fri Jul 1 07:50:35 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/beam/examples/MinimalWordCount.java   | 6 +++---
 .../java/org/apache/beam/examples/MinimalWordCountJava8.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d8c01c8b/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
----------------------------------------------------------------------
diff --git a/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
index 2c67609..9f6d61a 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java
@@ -67,17 +67,17 @@ public class MinimalWordCount {
     // In order to run your pipeline, you need to make following runner specific changes:
     //
     // CHANGE 1/3: Select a Beam runner, such as BlockingDataflowRunner
-    // or FlinkPipelineRunner.
+    // or FlinkRunner.
     // CHANGE 2/3: Specify runner-required options.
     // For BlockingDataflowRunner, set project and temp location as follows:
     //   DataflowPipelineOptions dataflowOptions = options.as(DataflowPipelineOptions.class);
     //   dataflowOptions.setRunner(BlockingDataflowRunner.class);
     //   dataflowOptions.setProject("SET_YOUR_PROJECT_ID_HERE");
     //   dataflowOptions.setTempLocation("gs://SET_YOUR_BUCKET_NAME_HERE/AND_TEMP_DIRECTORY");
-    // For FlinkPipelineRunner, set the runner as follows. See {@code FlinkPipelineOptions}
+    // For FlinkRunner, set the runner as follows. See {@code FlinkPipelineOptions}
     // for more details.
     //   options.as(FlinkPipelineOptions.class)
-    //      .setRunner(FlinkPipelineRunner.class);
+    //      .setRunner(FlinkRunner.class);
 
     // Create the Pipeline object with the options we defined above.
     Pipeline p = Pipeline.create(options);

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/d8c01c8b/examples/java8/src/main/java/org/apache/beam/examples/MinimalWordCountJava8.java
----------------------------------------------------------------------
diff --git a/examples/java8/src/main/java/org/apache/beam/examples/MinimalWordCountJava8.java b/examples/java8/src/main/java/org/apache/beam/examples/MinimalWordCountJava8.java
index 6362b96..ff8ca55 100644
--- a/examples/java8/src/main/java/org/apache/beam/examples/MinimalWordCountJava8.java
+++ b/examples/java8/src/main/java/org/apache/beam/examples/MinimalWordCountJava8.java
@@ -42,17 +42,17 @@ public class MinimalWordCountJava8 {
     // In order to run your pipeline, you need to make following runner specific changes:
     //
     // CHANGE 1/3: Select a Beam runner, such as BlockingDataflowRunner
-    // or FlinkPipelineRunner.
+    // or FlinkRunner.
     // CHANGE 2/3: Specify runner-required options.
     // For BlockingDataflowRunner, set project and temp location as follows:
     //   DataflowPipelineOptions dataflowOptions = options.as(DataflowPipelineOptions.class);
     //   dataflowOptions.setRunner(BlockingDataflowRunner.class);
     //   dataflowOptions.setProject("SET_YOUR_PROJECT_ID_HERE");
     //   dataflowOptions.setTempLocation("gs://SET_YOUR_BUCKET_NAME_HERE/AND_TEMP_DIRECTORY");
-    // For FlinkPipelineRunner, set the runner as follows. See {@code FlinkPipelineOptions}
+    // For FlinkRunner, set the runner as follows. See {@code FlinkPipelineOptions}
     // for more details.
     //   options.as(FlinkPipelineOptions.class)
-    //      .setRunner(FlinkPipelineRunner.class);
+    //      .setRunner(FlinkRunner.class);
 
     Pipeline p = Pipeline.create(options);
 


[2/3] incubator-beam git commit: [BEAM-392] Update flink dependency to the most recent stable version

Posted by al...@apache.org.
[BEAM-392] Update flink dependency to the most recent stable version


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/2d3d0f4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/2d3d0f4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/2d3d0f4c

Branch: refs/heads/master
Commit: 2d3d0f4c2bbfddaf36e6b1068739c9ea48587d6d
Parents: df1d5f6
Author: Isma�l Mej�a <ie...@gmail.com>
Authored: Wed Jun 29 23:00:02 2016 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Fri Jul 1 07:50:35 2016 +0200

----------------------------------------------------------------------
 runners/flink/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/2d3d0f4c/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index bea639e..653fe2c 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -39,7 +39,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <flink.version>1.0.0</flink.version>
+    <flink.version>1.0.3</flink.version>
   </properties>
 
   <repositories>


[3/3] incubator-beam git commit: This closes #561

Posted by al...@apache.org.
This closes #561


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

Branch: refs/heads/master
Commit: b4c123cd4d41234c28926e302c8ea7c8900d3672
Parents: df1d5f6 d8c01c8
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Fri Jul 1 07:53:18 2016 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Fri Jul 1 07:53:18 2016 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/beam/examples/MinimalWordCount.java   | 6 +++---
 .../java/org/apache/beam/examples/MinimalWordCountJava8.java   | 6 +++---
 runners/flink/pom.xml                                          | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------