Merge branch 'wip-1581-patterns-ask'

2012-01-23 18:35:30 +01:00 · 2012-01-23 18:35:30 +01:00 · 2a0c4ca145
commit 2a0c4ca145
parent 56b27d8c04 9d7ed5eba1
126 changed files with 980 additions and 415 deletions
--- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
+++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
@ -10,6 +10,7 @@ import akka.event.Logging.Warning
 import akka.dispatch.{ Future, Promise, Await }
 import akka.util.duration._
 import akka.actor.ActorSystem
+import akka.pattern.ask
 import akka.dispatch.Dispatcher

 /**