Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-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 3C16B17738 for ; Wed, 3 Jun 2015 22:26:27 +0000 (UTC) Received: (qmail 57434 invoked by uid 500); 3 Jun 2015 22:26:27 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 57403 invoked by uid 500); 3 Jun 2015 22:26:27 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 57394 invoked by uid 99); 3 Jun 2015 22:26:27 -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; Wed, 03 Jun 2015 22:26:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DBE91E3050; Wed, 3 Jun 2015 22:26:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andrewor14@apache.org To: commits@spark.apache.org Message-Id: <5b9945dcaa56465b91cedb74a212d4ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [HOTFIX] Unbreak build from backporting #6546 Date: Wed, 3 Jun 2015 22:26:26 +0000 (UTC) Repository: spark Updated Branches: refs/heads/branch-1.4 b2a22a651 -> d0be9508f [HOTFIX] Unbreak build from backporting #6546 This is caused by 7e46ea0228f142f6b384331d62cec8f86e61c9d1. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d0be9508 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d0be9508 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d0be9508 Branch: refs/heads/branch-1.4 Commit: d0be9508f50883c25456034d08343488928e6565 Parents: b2a22a6 Author: Andrew Or Authored: Wed Jun 3 15:25:35 2015 -0700 Committer: Andrew Or Committed: Wed Jun 3 15:25:35 2015 -0700 ---------------------------------------------------------------------- .../org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d0be9508/core/src/test/scala/org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala ---------------------------------------------------------------------- diff --git a/core/src/test/scala/org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala index 2ce1b5b..1b4257d 100644 --- a/core/src/test/scala/org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala +++ b/core/src/test/scala/org/apache/spark/scheduler/SparkListenerWithClusterSuite.scala @@ -21,7 +21,7 @@ import scala.collection.mutable import org.scalatest.{FunSuite, BeforeAndAfter, BeforeAndAfterAll} -import org.apache.spark.{LocalSparkContext, SparkContext, SparkFunSuite} +import org.apache.spark.{LocalSparkContext, SparkContext} import org.apache.spark.scheduler.cluster.ExecutorInfo /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org