Merge branch 'master' into release-0.1.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/492d919f Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/492d919f Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/492d919f Branch: refs/heads/release-0.1.0-incubating Commit: 492d919f38d2211f78e808b8a476138e691fcf96 Parents: 347d159 35098dc Author: Dan Halperin <dhalp...@google.com> Authored: Wed Jun 8 10:38:32 2016 -0700 Committer: Dan Halperin <dhalp...@google.com> Committed: Wed Jun 8 10:38:32 2016 -0700 ---------------------------------------------------------------------- distributions/src/main/assembly/src.xml | 2 +- runners/direct-java/pom.xml | 4 ++++ runners/flink/examples/pom.xml | 13 +++++++++++++ runners/flink/pom.xml | 15 --------------- runners/flink/runner/pom.xml | 12 ++++++++++++ runners/spark/pom.xml | 4 ++++ 6 files changed, 34 insertions(+), 16 deletions(-) ----------------------------------------------------------------------