Conflicts: akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala project/build/AkkaProject.scala both resolved by "union" approach - change wavesOfActors test for CTD: scheduling SHUTDOWN 10000 times does not work so well... - add executeFuture with trivial implementation, TBC |
||
|---|---|---|
| .. | ||
| build | ||
| plugins | ||
| scripts | ||
| build.properties | ||