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

Posted to commits@beam.apache.org by ch...@apache.org on 2018/12/05 19:36:07 UTC

[beam] 01/01: Merge pull request #7210: [BEAM-6182] Cherry-pick: Disable conscrypt by default (#7203)

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

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

commit 208700f1332cfa4d504816c1d488fcd63bc8113b
Merge: 4907821 5ee51d4
Author: Chamikara Jayalath <ch...@google.com>
AuthorDate: Wed Dec 5 11:36:00 2018 -0800

    Merge pull request #7210: [BEAM-6182] Cherry-pick: Disable conscrypt by default (#7203)

 .../dataflow/worker/DataflowWorkerHarnessHelper.java       | 14 +++++++++-----
 .../beam/runners/dataflow/worker/ExperimentContext.java    |  6 +++++-
 2 files changed, 14 insertions(+), 6 deletions(-)