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

Merging in master

Browse source
This commit is contained in:
Viktor Klang 2012-07-04 15:24:23 +02:00
commit 3911b18069
25 changed files with 285 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/java/code/docs/actor/UntypedActorDocTestBase.java
View file

@ -235,7 +235,7 @@ public class UntypedActorDocTestBase {
final ArrayList<Future<Object>> futures = new ArrayList<Future<Object>>();
futures.add(ask(actorA, "request", 1000)); // using 1000ms timeout
futures.add(ask(actorB, "reqeest", t)); // using timeout from above
futures.add(ask(actorB, "another request", t)); // using timeout from above
final Future<Iterable<Object>> aggregate = Futures.sequence(futures, system.dispatcher());