raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'ticket955'

Browse source 
Conflicts:
	akka-actor-tests/src/test/scala/akka/actor/supervisor/Ticket669Spec.scala
	akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
	akka-camel/src/test/scala/akka/camel/ConsumerScalaTest.scala
This commit is contained in:
Roland 2011-07-19 16:56:44 -04:00
commit 42769599aa
21 changed files with 363 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

1
akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala
View file

@ -10,6 +10,7 @@ import akka.util.duration._
import akka.actor._
import akka.actor.Actor._
import akka.routing._
import akka.event.EventHandler
import java.util.concurrent.atomic.AtomicInteger
import akka.dispatch.{ KeptPromise, Future }