This is an automated email from the ASF dual-hosted git repository. mxm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
commit 3400ba6e703b02c093721a0232a536c7c5ea9061 Merge: 20df151 d0254f0 Author: Maximilian Michels <m...@apache.org> AuthorDate: Wed Dec 12 21:52:20 2018 +0100 Merge pull request #7229: [BEAM-5419] Add Flink multi-version builds runners/flink/1.6/build.gradle | 33 ++++++ .../flink/1.6/job-server-container/build.gradle | 25 ++++ runners/flink/1.6/job-server/build.gradle | 30 +++++ runners/flink/build.gradle | 129 ++------------------- .../flink/{build.gradle => flink_runner.gradle} | 34 +++++- runners/flink/job-server-container/build.gradle | 39 +------ ...ld.gradle => flink_job_server_container.gradle} | 18 ++- runners/flink/job-server/build.gradle | 103 ++-------------- .../{build.gradle => flink_job_server.gradle} | 98 ++++++++++------ .../state/FlinkKeyGroupStateInternals.java | 3 +- settings.gradle | 10 ++ 11 files changed, 230 insertions(+), 292 deletions(-)