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 B787D19BD8 for ; Tue, 8 Mar 2016 02:11:28 +0000 (UTC) Received: (qmail 59656 invoked by uid 500); 8 Mar 2016 02:11:28 -0000 Delivered-To: apmail-beam-commits-archive@beam.apache.org Received: (qmail 59604 invoked by uid 500); 8 Mar 2016 02:11:28 -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 59595 invoked by uid 99); 8 Mar 2016 02:11:28 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Mar 2016 02:11:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 0A1E11806C7 for ; Tue, 8 Mar 2016 02:11:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 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.329] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 47-QluhWKTuU for ; Tue, 8 Mar 2016 02:11:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 9457D5FB00 for ; Tue, 8 Mar 2016 02:11:26 +0000 (UTC) Received: (qmail 59586 invoked by uid 99); 8 Mar 2016 02:11:25 -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; Tue, 08 Mar 2016 02:11:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7428DF99E; Tue, 8 Mar 2016 02:11:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davor@apache.org To: commits@beam.incubator.apache.org Date: Tue, 08 Mar 2016 02:11:26 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] incubator-beam git commit: Fixup CL Fixup CL Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/890e3a00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/890e3a00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/890e3a00 Branch: refs/heads/master Commit: 890e3a004392fdb7bc30a7976edd57d26669bb76 Parents: 532a792 Author: Davor Bonaci Authored: Mon Mar 7 18:03:09 2016 -0800 Committer: Davor Bonaci Committed: Mon Mar 7 18:03:09 2016 -0800 ---------------------------------------------------------------------- .../google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java | 2 -- .../cloud/dataflow/sdk/runners/DataflowPipelineRunner.java | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/890e3a00/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java ---------------------------------------------------------------------- diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java index 9e4bb50..111c24d 100644 --- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java +++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/coders/protobuf/ProtoCoder.java @@ -17,8 +17,6 @@ package com.google.cloud.dataflow.sdk.coders.protobuf; import static com.google.common.base.Preconditions.checkArgument; -import com.google.api.services.datastore.DatastoreV1; -import com.google.api.services.datastore.DatastoreV1.Entity; import com.google.cloud.dataflow.sdk.coders.AtomicCoder; import com.google.cloud.dataflow.sdk.coders.CannotProvideCoderException; import com.google.cloud.dataflow.sdk.coders.Coder; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/890e3a00/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java ---------------------------------------------------------------------- diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java index 0612cca..c90b904 100644 --- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java +++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java @@ -172,8 +172,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.annotation.Nullable; - /** * A {@link PipelineRunner} that executes the operations in the * pipeline by first translating them to the Dataflow representation @@ -430,7 +428,7 @@ public class DataflowPipelineRunner extends PipelineRunner if (!options.getEnableCloudDebugger()) { return; } - + if (options.getDebuggee() != null) { throw new RuntimeException("Should not specify the debuggee"); }