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

Revert "Change socket options type from immutable.Traversable to Traversable"

Browse source 
This reverts commit ba922fa2d7.

Conflicts:
	akka-io/src/main/scala/akka/io/Tcp.scala
	akka-io/src/main/scala/akka/io/TcpIncomingConnection.scala
	akka-io/src/main/scala/akka/io/TcpListener.scala
	akka-io/src/main/scala/akka/io/TcpOutgoingConnection.scala
This commit is contained in:
Johannes Rudolph 2013-01-22 16:03:22 +01:00
parent c6265843b3
commit fccf596649
7 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-io/src/test/scala/akka/io/IntegrationSpecSupport.scala
View file

@ -7,6 +7,7 @@ package akka.io
import scala.annotation.tailrec
import akka.testkit.{ AkkaSpec, TestProbe }
import akka.actor.ActorRef
import scala.collection.immutable
import Tcp._
import TestUtils._
@ -45,10 +46,10 @@ trait IntegrationSpecSupport { _: AkkaSpec ⇒
}
/** allow overriding socket options for server side channel */
def bindOptions: Traversable[SocketOption] = Nil
def bindOptions: immutable.Traversable[SocketOption] = Nil
/** allow overriding socket options for client side channel */
def connectOptions: Traversable[SocketOption] = Nil
def connectOptions: immutable.Traversable[SocketOption] = Nil
}
}