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

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

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

@ -317,7 +317,7 @@ public class UntypedActorDocTestBase {
Procedure<Object> angry = new Procedure<Object>() {
@Override
public void apply(Object message) {
if (message.equals("foo")) {
if (message.equals("bar")) {
getSender().tell("I am already angry?");
} else if (message.equals("foo")) {
getContext().become(happy);