You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ro...@apache.org on 2018/03/16 21:01:30 UTC

[beam] branch release-2.4.0 updated (fadab7f -> d224bfb)

This is an automated email from the ASF dual-hosted git repository.

robertwb pushed a change to branch release-2.4.0
in repository https://gitbox.apache.org/repos/asf/beam.git.


    from fadab7f  Merge pull request #4847 from charlesccychen/revert-pr-4666-cp
     add 2cdcfbe  [BEAM-3806] Fix direct-runner hang (#4829)
     add 13a3dd1  Annotate ParDoTest.duplicateTimerSetting with UsesTestStream
     new d224bfb  Merge pull request #4872 from bjchambers/cherrypick-4829

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../beam/runners/direct/WatermarkManager.java      | 38 ++++++++-------
 .../beam/runners/direct/WatermarkManagerTest.java  | 54 ++++++++++++++++++++++
 .../org/apache/beam/sdk/transforms/ParDoTest.java  | 33 +++++++++++++
 3 files changed, 108 insertions(+), 17 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
robertwb@apache.org.

[beam] 01/01: Merge pull request #4872 from bjchambers/cherrypick-4829

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

robertwb pushed a commit to branch release-2.4.0
in repository https://gitbox.apache.org/repos/asf/beam.git

commit d224bfbb73149523bbead16cb1006881a3deb69c
Merge: fadab7f 13a3dd1
Author: Robert Bradshaw <ro...@gmail.com>
AuthorDate: Fri Mar 16 14:01:27 2018 -0700

    Merge pull request #4872 from bjchambers/cherrypick-4829
    
    Cherrypick pr/4829 and pr/4849 [BEAM-3806] direct runner fixes.

 .../beam/runners/direct/WatermarkManager.java      | 38 ++++++++-------
 .../beam/runners/direct/WatermarkManagerTest.java  | 54 ++++++++++++++++++++++
 .../org/apache/beam/sdk/transforms/ParDoTest.java  | 33 +++++++++++++
 3 files changed, 108 insertions(+), 17 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
robertwb@apache.org.