summaryrefslogtreecommitdiff
path: root/test/files/jvm/future-spec/PromiseTests.scala
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'ad845ff' into merge/2.10.x-to-2.11.x-20150224Jason Zaugg2015-02-241-8/+67
|\
| * SI-8689 Avoid internal error in Promise after sequence of completionsViktor Klang2015-02-041-9/+68
* | Merge commit '7d74884' into merge-2.10.x-to-masterJason Zaugg2013-12-061-2/+2
|\|
| * SI-6913 Fixing semantics of Future fallbackTo to be according to docsHeather Miller2013-12-051-2/+2
* | Make future-spec tests not spawn threads in constructors.James Iry2013-11-011-1/+1
* | Cull extraneous whitespace.Paul Phillips2013-09-181-39/+39
|/
* move Duration (incl. DSL) into scala.concurrent.duration packageRoland2012-09-191-2/+2
* Basing Futures on Try instead of EitherHeather Miller2012-08-041-7/+7
* Critical bugfixes/leak fixes/API corrections + ScalaDoc for SIP-14Viktor Klang2012-07-191-6/+3
* Collection of updates to SIP-14 (scala.concurrent)Havoc Pennington2012-07-091-5/+10
* SIP-14: clean ups and fixesphaller2012-05-171-1/+1
* Widen types in signatures of Future companion methods, refactor OnceCanBuildF...Aleksandar Prokopec2012-05-011-0/+244