You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/07/04 19:12:53 UTC
git commit: HOTFIX: Merge issue with cf1d46e4.
Repository: spark
Updated Branches:
refs/heads/branch-1.0 354a62739 -> fb2fe808c
HOTFIX: Merge issue with cf1d46e4.
The tests in that patch used a newer constructor for TaskInfo.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fb2fe808
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fb2fe808
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fb2fe808
Branch: refs/heads/branch-1.0
Commit: fb2fe808cf8948f3ca95667d2269b27c3f8c798b
Parents: 354a627
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Jul 4 10:09:58 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Jul 4 10:09:58 2014 -0700
----------------------------------------------------------------------
.../org/apache/spark/storage/StorageStatusListenerSuite.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/fb2fe808/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala b/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala
index 2179c6d..99de00a 100644
--- a/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala
@@ -28,8 +28,8 @@ import org.apache.spark.scheduler._
class StorageStatusListenerSuite extends FunSuite {
private val bm1 = BlockManagerId("big", "dog", 1, 1)
private val bm2 = BlockManagerId("fat", "duck", 2, 2)
- private val taskInfo1 = new TaskInfo(0, 0, 0, 0, "big", "dog", TaskLocality.ANY, false)
- private val taskInfo2 = new TaskInfo(0, 0, 0, 0, "fat", "duck", TaskLocality.ANY, false)
+ private val taskInfo1 = new TaskInfo(0, 0, 0, "big", "dog", TaskLocality.ANY)
+ private val taskInfo2 = new TaskInfo(0, 0, 0, "fat", "duck", TaskLocality.ANY)
test("block manager added/removed") {
val listener = new StorageStatusListener