You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@beam.apache.org by cc...@apache.org on 2018/11/22 02:02:49 UTC

[beam] 01/01: Merge pull request #7119 from chamikaramj/revert_pr_6683_branch_2

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

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

commit ac2edbe9d4999b0b1b17848d6238fefc3d444f8d
Merge: 54fe812 dd4f97c
Author: Charles Chen <ch...@users.noreply.github.com>
AuthorDate: Wed Nov 21 18:02:42 2018 -0800

    Merge pull request #7119 from chamikaramj/revert_pr_6683_branch_2
    
    [BEAM-6085] Revert "[BEAM-5442] Revert #6675 "Revert PRs #6557 #6589 #6600""

 .../python/apache_beam/options/pipeline_options.py | 32 +---------------------
 .../apache_beam/options/pipeline_options_test.py   | 23 ++--------------
 .../runners/worker/sdk_worker_main_test.py         |  4 +--
 3 files changed, 6 insertions(+), 53 deletions(-)