Merge pull request #16730 from akka/wip-15851-ActorBasedFlowMaterializer-patriknw

!str #15851 Rename FlowMaterializer and settings
This commit is contained in:
Patrik Nordwall 2015-01-29 10:30:08 +01:00
commit 580ba8c484
146 changed files with 601 additions and 595 deletions

View file

@ -21,12 +21,12 @@ class StreamTcpDocSpec extends AkkaSpec {
implicit val ec = system.dispatcher
//#setup
import akka.stream.FlowMaterializer
import akka.stream.ActorFlowMaterializer
import akka.stream.scaladsl.StreamTcp
import akka.stream.scaladsl.StreamTcp._
implicit val sys = ActorSystem("stream-tcp-system")
implicit val mat = FlowMaterializer()
implicit val mat = ActorFlowMaterializer()
//#setup
val localhost = new InetSocketAddress("127.0.0.1", 8888)