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

Resolve merge conflict in cherry-pick

Browse source
This commit is contained in:
Viktor Klang 2011-05-17 09:16:16 +02:00
parent 9b512e9f04
commit e2042d003d
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
View file

@ -200,7 +200,7 @@ abstract class RemoteClient private[akka] (
Some(actorRef), Some(actorRef),
Left(actorRef.uuid), Left(actorRef.uuid),
actorRef.address, actorRef.address,
actorRef.timeout, timeout,
Right(message), Right(message),
isOneWay, isOneWay,
senderOption, senderOption,