Merged wip-2.0 branch with latest master

2011-05-16 12:32:00 +02:00 · 2011-05-16 12:32:00 +02:00 · 2655d44ee9
commit 2655d44ee9
parent 6c6089e081 62427f518c
207 changed files with 6049 additions and 4773 deletions
--- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
@ -240,7 +240,7 @@ class TestActorRefSpec extends WordSpec with MustMatchers with BeforeAndAfterEac
      ref ! ch
      val f = ch.future
      f must be ('completed)
-      f() must be ("complexReply")
+      f.get must be ("complexReply")
    }

  }