[beam] branch master updated (a2f47fa -> 731a694)

[pa...@apache.org]

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

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


    from a2f47fa  Fix simple style issue
     add 973b523  Fix Pipeline options with multi value deserialization from map
     new 731a694  Merge pull request #6262 from angoenka/fix_multi_pipeline_options

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:
 .../python/apache_beam/options/pipeline_options.py |  4 ++
 .../apache_beam/options/pipeline_options_test.py   | 47 +++++++++++++++++-----
 2 files changed, 42 insertions(+), 9 deletions(-)

[beam] 01/01: Merge pull request #6262 from angoenka/fix_multi_pipeline_options

[pa...@apache.org]

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

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

commit 731a694e728c77845ac551cb6d298dd76f504417
Merge: a2f47fa 973b523
Author: Pablo <pa...@users.noreply.github.com>
AuthorDate: Thu Aug 23 11:49:33 2018 -0700

    Merge pull request #6262 from angoenka/fix_multi_pipeline_options
    
    [BEAM-5194] Fix Pipeline options with multi value deserialization from map

 .../python/apache_beam/options/pipeline_options.py |  4 ++
 .../apache_beam/options/pipeline_options_test.py   | 47 +++++++++++++++++-----
 2 files changed, 42 insertions(+), 9 deletions(-)