summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/Future.scala
Commit message (Expand)AuthorAgeFilesLines
* Link 'Future' scaladoc to 'Futures and Promises'Arnout Engelen2016-01-251-0/+2
* Use InternalCallbackExecutor in Future.sequencePaul Draper2015-10-021-1/+1
* Fix many typos in docs and commentsmpociecha2014-12-141-1/+1
* [backport] Did not know of the fix for SI-8672. Followed the recommendation g...Dominik Gruntz2014-08-111-2/+2
* [backport] Fixes first sentence delimitersdgruntz2014-08-111-2/+2
* Fix misuse of underscores.Paul Phillips2014-01-251-4/+4
* Merge commit '7d74884' into merge-2.10.x-to-masterJason Zaugg2013-12-061-1/+4
|\
| * SI-6913 Fixing semantics of Future fallbackTo to be according to docsHeather Miller2013-12-051-1/+4
* | fix typoxuwei-k2013-11-181-1/+1
* | SI-7958 Deprecate methods `future` and `promise` in the `scala.concurrent` pa...Philipp Haller2013-11-121-14/+14
* | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-master-2Jason Zaugg2013-09-271-7/+4
|\|
| * SI-7861 Don't execute internal callbacks on the user ExecutorJason Zaugg2013-09-211-7/+4
* | Convenience methods from Try[T] => {Future, Promise}[T]Jason Zaugg2013-09-191-0/+7
* | Cull extraneous whitespace.Paul Phillips2013-09-181-1/+1
* | Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.xGrzegorz Kossakowski2013-07-291-2/+7
|\|
| * SI-7336 - Link flatMapped promises to avoid memory leaksRich Dougherty2013-07-061-2/+7
* | Merge 2.10.x into masterAdriaan Moors2013-06-281-135/+42
|\|
| * Cleaning up method implementations in FutureViktor Klang2013-06-191-137/+44
| * Merge 2.10.1 into 2.10.x.Adriaan Moors2013-02-271-3/+103
| |\
| | * [nomaster] can't add new class BatchingExecutorAdriaan Moors2013-02-091-3/+103
* | | Deprecate parameter names in scala.concurrentViktor Klang2013-05-161-24/+24
* | | fix typo in commentRobert Ladstätter2013-05-061-1/+1
* | | More explicit empty paren lists in method calls.Jason Zaugg2013-02-241-3/+3
|/ /
* / make Future scaladoc examples up-to-date and compilableEugene Platonov2013-02-151-6/+6
|/
* Fix SI-6932 by enabling linearization of callback execution for the internal...Viktor Klang2013-01-211-3/+3
* Removing controversial `either` method from Futures API.Josh Suereth2012-11-211-23/+0
* Merge pull request #1559 from heathermiller/copyright-updateJosh Suereth2012-11-041-1/+1
|\
| * Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-021-1/+1
* | Typo-fix in scala.concurrent.Future, thanks to @pavelpavlovHeather Miller2012-11-021-1/+1
|/
* Eliminate breaking relative names in source.Paul Phillips2012-09-141-8/+8
* fix usage of Duration in Promise implRoland2012-09-101-1/+0
* Doc fix on exec ctx prepare method, fix to testsHeather Miller2012-08-081-1/+1
* Basing Futures on Try instead of EitherHeather Miller2012-08-041-46/+39
* Critical bugfixes/leak fixes/API corrections + ScalaDoc for SIP-14Viktor Klang2012-07-191-4/+2
* SI-6095, SI-6098 - clean up public API, add deprecationsphaller2012-07-181-14/+8
* Squashed critical enhancements to SIP-14: daemonizing global EC, giving EC to...Viktor Klang2012-07-131-1/+1
* Collection of updates to SIP-14 (scala.concurrent)Havoc Pennington2012-07-091-5/+24
* SI-5981, SI-5979, SI-5973 Closed. Maintenance to Try.Heather Miller2012-07-051-1/+2
* removes tags and their incantations from PredefEugene Burmako2012-06-081-0/+1
* ClassTag.erasure => ClassTag.runtimeClassEugene Burmako2012-06-081-1/+1
* Move implicit ExecutionContext to be determined by lexical scopephaller2012-05-241-26/+76
* SIP-14: clean ups and fixesphaller2012-05-171-28/+54
* Address doc comment rot in the standard library.Jason Zaugg2012-05-131-2/+2
* Move resolver and resolveEither to impl.Promisephaller2012-05-101-6/+8
* Remove newPromise methodphaller2012-05-031-4/+0
* Resolve merge conflictsphaller2012-05-031-46/+50
|\
| * Widen types in signatures of Future companion methods, refactor OnceCanBuildF...Aleksandar Prokopec2012-05-011-24/+28
| * Porting akka future tests.Aleksandar Prokopec2012-04-271-9/+9
|/
* migrates stdlib and compiler to tagsEugene Burmako2012-04-231-18/+18
* Clean ups in futures based on review by @heathermiller and review by @viktork...phaller2012-04-151-1/+18