[beam] branch master updated (b4d2d8e -> 4b5b1a0)

[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 b4d2d8e  Merge pull request #7412: [BEAM-4143] GcsResourceIdTest has had a masked failure
     add a1d938e  [BEAM-6367] Fix JdbcDriver breaking DriverManager#getConnection
     new 4b5b1a0  Merge pull request #7417 from kanterov/kanterov_fix_beam_driver

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:
 .../java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java | 4 ++++
 .../org/apache/beam/sdk/extensions/sql/impl/JdbcDriverTest.java  | 9 +++++++++
 2 files changed, 13 insertions(+)

[beam] 01/01: Merge pull request #7417 from kanterov/kanterov_fix_beam_driver

[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 4b5b1a0b0880a0897967c7af9849e498348cfe39
Merge: b4d2d8e a1d938e
Author: Andrew Pilloud <ap...@users.noreply.github.com>
AuthorDate: Fri Jan 4 08:56:35 2019 -0800

    Merge pull request #7417 from kanterov/kanterov_fix_beam_driver
    
    [BEAM-6367] Fix JdbcDriver breaking DriverManager#getConnection

 .../java/org/apache/beam/sdk/extensions/sql/impl/JdbcDriver.java | 4 ++++
 .../org/apache/beam/sdk/extensions/sql/impl/JdbcDriverTest.java  | 9 +++++++++
 2 files changed, 13 insertions(+)