summaryrefslogtreecommitdiff
path: root/src/library/scala/concurrent/impl/Future.scala
Commit message (Expand)AuthorAgeFilesLines
* Add missing canonical combinators:Viktor Klang2014-10-201-34/+0
* Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-masterJason Zaugg2013-05-171-1/+1
|\
| * Remove unused imports in library.Paul Phillips2012-11-191-1/+1
* | SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for capturin...Viktor Klang2013-05-101-1/+1
|/
* Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013Heather Miller2012-11-021-1/+1
* Basing Futures on Try instead of EitherHeather Miller2012-08-041-2/+2
* Clean ups in impl.Futurephaller2012-07-191-12/+3
* Critical bugfixes/leak fixes/API corrections + ScalaDoc for SIP-14Viktor Klang2012-07-191-9/+0
* SI-6095, SI-6098 - clean up public API, add deprecationsphaller2012-07-181-14/+1
* Squashed critical enhancements to SIP-14: daemonizing global EC, giving EC to...Viktor Klang2012-07-131-14/+1
* Collection of updates to SIP-14 (scala.concurrent)Havoc Pennington2012-07-091-88/+14
* SI-5981, SI-5979, SI-5973 Closed. Maintenance to Try.Heather Miller2012-07-051-0/+1
* rework Future.dispatchFuture a bit to fix bugs / optimizeHavoc Pennington2012-06-131-31/+75
* Move implicit ExecutionContext to be determined by lexical scopephaller2012-05-241-2/+0
* SIP-14: clean ups and fixesphaller2012-05-171-0/+2
* Move resolver and resolveEither to impl.Promisephaller2012-05-101-1/+1
* Merge pull request #15phaller2012-05-011-31/+24
|\
| * Unbreaking tryComplete + Future.apply since resolver must be use both for box...Viktor Klang2012-04-161-1/+1
| * Removing a lot of residue and superfluous method declarations. Moving out new...Viktor Klang2012-04-151-35/+3
* | Clean ups in futures based on review by @heathermiller and review by @viktork...phaller2012-04-151-22/+3
* | Fix issues with exception handling in futures. Review by @heathermillerphaller2012-04-141-2/+6
|/
* Adding FIXME about putting mixed beans in the EC-basketViktor Klang2012-04-131-1/+1
* Adding NonFatal matching as to not catch anything that should terminate the J...Viktor Klang2012-04-131-8/+4
* Updating to latest version of Akka's DefaultPromiseViktor Klang2012-04-131-1/+1
* Making changes in the scala.concurrent package.aleksandar2012-04-121-1/+12
* Remedies Try/Either signature disparity for source compat. w/ AkkaHeather Miller2012-04-031-6/+3
* Add withFilter and mapTo to futures.Aleksandar Prokopec2012-03-291-30/+0
* Work on source compatibility between akka and scala futures.Aleksandar Prokopec2012-03-281-4/+70
* Deprecate scala.parallel.Future and privatize a few classes.Aleksandar Prokopec2012-03-201-1/+1
* Whitespace commit.Paul Phillips2012-02-291-10/+10
* Fix for "type _$1 defined twice".Paul Phillips2012-02-171-6/+18
* Disable execution context and futures implementation in the default package.Aleksandar Prokopec2012-02-161-0/+77