Resolve merge conflict in cherry-pick

2011-05-17 09:16:16 +02:00 · 2011-05-17 09:16:16 +02:00 · e2042d003d
commit e2042d003d
parent 9b512e9f04
1 changed files with 1 additions and 1 deletions
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@ -200,7 +200,7 @@ abstract class RemoteClient private[akka] (
        Some(actorRef),
        Left(actorRef.uuid),
        actorRef.address,
-        actorRef.timeout,
+        timeout,
        Right(message),
        isOneWay,
        senderOption,