You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@beam.apache.org by mx...@apache.org on 2018/11/09 11:23:28 UTC

[beam] 01/01: Merge pull request #6990: [BEAM-5931]Revert "Revert "[BEAM-5299] Define max timestamp for global window in proto""

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 0f1f8f7bb11dd75bb16b810586fe47c13db8a069
Merge: 6ccd7d2 a9723d9
Author: Maximilian Michels <mx...@apache.org>
AuthorDate: Fri Nov 9 12:23:18 2018 +0100

    Merge pull request #6990: [BEAM-5931]Revert "Revert "[BEAM-5299] Define max timestamp for global window in proto""

 model/pipeline/src/main/proto/beam_runner_api.proto    | 18 ++++++++++++++++++
 sdks/go/pkg/beam/core/graph/mtime/time.go              |  1 +
 sdks/java/core/build.gradle                            |  2 ++
 .../beam/sdk/transforms/windowing/BoundedWindow.java   | 13 ++++++++++---
 .../beam/sdk/transforms/windowing/GlobalWindow.java    | 15 ++++++++++++---
 .../java/org/apache/beam/SdkCoreApiSurfaceTest.java    |  1 +
 sdks/python/apache_beam/io/iobase.py                   |  6 ++++--
 sdks/python/apache_beam/portability/common_urns.py     |  6 ++++++
 sdks/python/apache_beam/transforms/window.py           | 14 +++++++-------
 sdks/python/apache_beam/utils/timestamp.py             |  8 ++++++--
 10 files changed, 67 insertions(+), 17 deletions(-)