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

Merge pull request #18875 from ktoso/wip-akka.js-cherries-ktoso

Browse source 
Akka.js cherries to master
This commit is contained in:
Roland Kuhn 2015-11-07 18:01:24 +01:00
commit f1abaa1c5e
41 changed files with 630 additions and 580 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/rst/java/code/docs/ddata/DataBot.java
View file

@ -6,7 +6,7 @@ package docs.ddata;
//#data-bot
import static java.util.concurrent.TimeUnit.SECONDS;
import scala.concurrent.duration.Duration;
import scala.concurrent.forkjoin.ThreadLocalRandom;
import java.util.concurrent.ThreadLocalRandom;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;

2
akka-docs/rst/java/code/docs/ddata/DistributedDataDocTest.java
View file

@ -18,7 +18,7 @@ import org.junit.Test;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import scala.concurrent.duration.FiniteDuration;
import scala.concurrent.forkjoin.ThreadLocalRandom;
import java.util.concurrent.ThreadLocalRandom;
import akka.actor.Actor;
import akka.actor.ActorLogging;