[beam] branch master updated (2b777a1 -> f9d3f55)

[ap...@apache.org]

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

apilloud pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git.


    from 2b777a1  [BEAM-5184] Multimap side inputs with duplicate keys and values are being lost
     add 1a55497  Relax back restriction on parsing file scheme
     new f9d3f55  Merge pull request #6251 from JozoVilcek/relax-scheme-parsing

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:
 sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileSystems.java    | 2 +-
 .../java/core/src/test/java/org/apache/beam/sdk/io/FileSystemsTest.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

[beam] 01/01: Merge pull request #6251 from JozoVilcek/relax-scheme-parsing

[ap...@apache.org]

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

apilloud pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit f9d3f558ee78a0d3a43bec664235579a2a5f98b4
Merge: 2b777a1 1a55497
Author: Andrew Pilloud <ap...@users.noreply.github.com>
AuthorDate: Fri Aug 24 11:07:59 2018 -0700

    Merge pull request #6251 from JozoVilcek/relax-scheme-parsing
    
    [BEAM-5180] Relax back restriction on parsing file scheme

 sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileSystems.java    | 2 +-
 .../java/core/src/test/java/org/apache/beam/sdk/io/FileSystemsTest.java | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)