From commits-return-114419-archive-asf-public=cust-asf.ponee.io@beam.apache.org Tue Jul 13 14:05:27 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 3AF04180660 for ; Tue, 13 Jul 2021 16:05:27 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id 627443F2D8 for ; Tue, 13 Jul 2021 14:05:26 +0000 (UTC) Received: (qmail 79482 invoked by uid 500); 13 Jul 2021 14:05:26 -0000 Mailing-List: contact commits-help@beam.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.apache.org Delivered-To: mailing list commits@beam.apache.org Received: (qmail 79472 invoked by uid 99); 13 Jul 2021 14:05:26 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jul 2021 14:05:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 17AEA8DC92; Tue, 13 Jul 2021 14:05:26 +0000 (UTC) Date: Tue, 13 Jul 2021 14:05:17 +0000 To: "commits@beam.apache.org" Subject: [beam] 01/01: Merge pull request #15159: [BEAM-12597] Add AppendingTransformer for reference.conf in shade MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: chamikara@apache.org In-Reply-To: <162618511131.6006.8079026528795217876@gitbox.apache.org> References: <162618511131.6006.8079026528795217876@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: beam X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b97fe93d84d086522f90d39f85a27541175a011f X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20210713140526.17AEA8DC92@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. chamikara pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git commit b97fe93d84d086522f90d39f85a27541175a011f Merge: 5e26d3b bc742c8 Author: Chamikara Jayalath AuthorDate: Tue Jul 13 07:04:23 2021 -0700 Merge pull request #15159: [BEAM-12597] Add AppendingTransformer for reference.conf in shade .../examples/src/main/resources/archetype-resources/pom.xml | 3 +++ .../gcp-bom-examples/src/main/resources/archetype-resources/pom.xml | 3 +++ 2 files changed, 6 insertions(+)