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-tests/src/test/scala/akka/http/scaladsl/server/DontLeakActorsOnFailingConnectionSpecs.scala
View file

@ -34,7 +34,7 @@ class DontLeakActorsOnFailingConnectionSpecs extends WordSpecLike with Matchers
}""").withFallback(ConfigFactory.load())
implicit val system = ActorSystem("DontLeakActorsOnFailingConnectionSpecs", config)
import system.dispatcher
implicit val mat = ActorMaterializer()
implicit val materializer = ActorMaterializer()
val log = Logging(system, getClass)