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

Merge remote-tracking branch 'pr/19150' into release-2.3-dev

Browse source
This commit is contained in:
Roland Kuhn 2015-12-13 16:55:39 +01:00
commit 27353d4952
57 changed files with 99 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala
View file

@ -22,7 +22,7 @@ import scala.util.{ Failure, Success }
object EchoTestClientApp extends App {
implicit val system = ActorSystem()
import system.dispatcher
implicit val mat = ActorMaterializer()
implicit val materializer = ActorMaterializer()
def delayedCompletion(delay: FiniteDuration): Source[Nothing, Unit] =
Source.single(1)

2
akka-http-core/src/test/scala/akka/http/impl/engine/ws/WSClientAutobahnTest.scala
View file

@ -23,7 +23,7 @@ import akka.http.scaladsl.model.ws._
object WSClientAutobahnTest extends App {
implicit val system = ActorSystem()
import system.dispatcher
implicit val mat = ActorMaterializer()
implicit val materializer = ActorMaterializer()
val Agent = "akka-http"
val Parallelism = 4