From commits-return-99500-archive-asf-public=cust-asf.ponee.io@beam.apache.org Fri Nov 9 12:23:29 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 4F05618067A for ; Fri, 9 Nov 2018 12:23:29 +0100 (CET) Received: (qmail 76104 invoked by uid 500); 9 Nov 2018 11:23:28 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 76094 invoked by uid 99); 9 Nov 2018 11:23:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2018 11:23:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id DD5318705D; Fri, 9 Nov 2018 11:23:27 +0000 (UTC) Date: Fri, 09 Nov 2018 11:23:28 +0000 To: "commits@beam.apache.org" Subject: [beam] 01/01: Merge pull request #6990: [BEAM-5931]Revert "Revert "[BEAM-5299] Define max timestamp for global window in proto"" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: mxm@apache.org In-Reply-To: <154176260673.17380.6336603991858805703@gitbox.apache.org> References: <154176260673.17380.6336603991858805703@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: beam X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 0f1f8f7bb11dd75bb16b810586fe47c13db8a069 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181109112327.DD5318705D@gitbox.apache.org> 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 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(-)