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

Merge branch 'master' into wip-2103-cluster-routers-patriknw

Browse source 
Conflicts:
	akka-remote/src/main/scala/akka/routing/RemoteRouterConfig.scala
This commit is contained in:
Patrik Nordwall 2012-09-07 16:57:49 +02:00
commit b400b0b818
77 changed files with 720 additions and 490 deletions
Download patch file Download diff file Expand all files Collapse all files

1
akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinRoutedActorSpec.scala
View file

@ -3,6 +3,7 @@
*/
package akka.cluster.routing
import language.postfixOps
import scala.concurrent.Await
import scala.concurrent.util.duration._
import com.typesafe.config.ConfigFactory