Return-Path: X-Original-To: apmail-beam-commits-archive@minotaur.apache.org Delivered-To: apmail-beam-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 87F8F19168 for ; Thu, 7 Apr 2016 19:57:21 +0000 (UTC) Received: (qmail 67873 invoked by uid 500); 7 Apr 2016 19:57:21 -0000 Delivered-To: apmail-beam-commits-archive@beam.apache.org Received: (qmail 67823 invoked by uid 500); 7 Apr 2016 19:57:21 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 67812 invoked by uid 99); 7 Apr 2016 19:57:21 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 19:57:21 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E82DFC0362 for ; Thu, 7 Apr 2016 19:57:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id jCHI9Nv_clua for ; Thu, 7 Apr 2016 19:57:20 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 43B835FAF2 for ; Thu, 7 Apr 2016 19:57:19 +0000 (UTC) Received: (qmail 67803 invoked by uid 99); 7 Apr 2016 19:57:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 19:57:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C795ADFC6C; Thu, 7 Apr 2016 19:57:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kenn@apache.org To: commits@beam.incubator.apache.org Message-Id: <07249fde5626442ab0a38b6a3695814a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-beam git commit: Fix up conflict markers Date: Thu, 7 Apr 2016 19:57:17 +0000 (UTC) Repository: incubator-beam Updated Branches: refs/heads/master 6467afb74 -> 1451a0ec9 Fix up conflict markers Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1451a0ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1451a0ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1451a0ec Branch: refs/heads/master Commit: 1451a0ec92c1d8c3a86e0a1518c04b3ebd8520e2 Parents: 6467afb Author: Kenneth Knowles Authored: Thu Apr 7 12:57:02 2016 -0700 Committer: Kenneth Knowles Committed: Thu Apr 7 12:57:02 2016 -0700 ---------------------------------------------------------------------- .../test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1451a0ec/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java index a17d153..5a9a8c6 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/io/TextIOTest.java @@ -41,13 +41,7 @@ import com.google.cloud.dataflow.sdk.testing.TestPipeline; import com.google.cloud.dataflow.sdk.transforms.Create; import com.google.cloud.dataflow.sdk.transforms.PTransform; import com.google.cloud.dataflow.sdk.util.CoderUtils; -<<<<<<< HEAD -import com.google.cloud.dataflow.sdk.util.GcsUtil; import com.google.cloud.dataflow.sdk.util.IOChannelUtils; -import com.google.cloud.dataflow.sdk.util.TestCredential; -import com.google.cloud.dataflow.sdk.util.gcsfs.GcsPath; -======= ->>>>>>> a8a3419... [BEAM-151] Break out Dataflow runner specific tests to separate file import com.google.cloud.dataflow.sdk.values.PCollection; import com.google.cloud.dataflow.sdk.values.PDone; import com.google.common.collect.ImmutableList;