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

Merge pull request #1859 from akka/wip-3753-change-build-to-allow-scala-nightlies-ban

Browse source 
=pro #3753 Override dependency versions from command line
This commit is contained in:
Björn Antonsson 2013-12-04 02:04:41 -08:00
commit cb729228b0
9 changed files with 78 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala
View file

@ -418,9 +418,10 @@ class FutureDocSpec extends AkkaSpec {
"demonstrate usage of pattern.after" in {
//#after
import akka.pattern.after
// TODO after is unfortunately shadowed by ScalaTest, fix as part of #3759
// import akka.pattern.after
val delayed = after(200 millis, using = system.scheduler)(Future.failed(
val delayed = akka.pattern.after(200 millis, using = system.scheduler)(Future.failed(
new IllegalStateException("OHNOES")))
val future = Future { Thread.sleep(1000); "foo" }
val result = Future firstCompletedOf Seq(future, delayed)