summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fixed POM for sonatypes standards.v2.10.0-M2Josh Suereth2012-02-208-0/+96
* Added the ability to publish signed artifacts.Josh Suereth2012-02-201-2/+102
* Javadoc + Source jar generation is now complete for maven deployment.Josh Suereth2012-02-202-30/+40
* A better error message for inheritance conflict.Paul Phillips2012-02-191-1/+9
* Streamlining skolemization, specialization.Paul Phillips2012-02-196-58/+75
* Merge remote-tracking branch 'TiarkRompf/SI-5506' into developPaul Phillips2012-02-192-7/+50
|\
| * fixes SI-5506. better cps type propagation for polymorphic and multi-argument...Tiark Rompf2012-02-192-7/+50
* | Merge remote-tracking branch 'szabolcsberecz/SI-5215' into developPaul Phillips2012-02-192-15/+6
|\ \
| * | Fix for SI-5215: scalac crash when @elidable used in traitSzabolcs Berecz2012-02-192-15/+6
* | | Specialize Tuple2 on more types.Paul Phillips2012-02-192-2/+2
|/ /
* | Fix [@spec A] to correctly induce AnyRef specialization.Erik Osheim2012-02-191-16/+15
* | More on SI-5500.Paul Phillips2012-02-184-34/+41
| |
| \
*-. \ Merge branch 'master', remote-tracking branch 'non/si-5500' into developPaul Phillips2012-02-1812-57/+46
|\ \ \
| | * | Fixed over-optimistic anyrefSpecCache (closes SI-5500).Erik Osheim2012-02-191-6/+9
| * | | Cleanup in aisle New.Paul Phillips2012-02-1812-51/+37
| | | |
| \ \ \
*-. \ \ \ Merge remote-tracking branches 'hubertp/issue/5452' and 'hubertp/issue/5493' ...Paul Phillips2012-02-173-10/+25
|\ \ \ \ \ | |_|/ / / |/| | | |
| | * | | Closes #5497.Hubert Plociniczak2012-02-181-2/+6
| | | |/ | | |/|
| * / | Closes #5452.Hubert Plociniczak2012-02-172-8/+19
| |/ /
* | | Merge remote-tracking branch 'scalamacros/pullrequest/macros' into developPaul Phillips2012-02-174-31/+75
|\ \ \
| * | | Fixes miscellaneous macro bugsEugene Burmako2012-02-174-31/+75
| |/ /
* | | Merge branch 'develop'Paul Phillips2012-02-1730-116/+2571
|\ \ \ | |_|/ |/| |
| * | Fix for "type _$1 defined twice".Paul Phillips2012-02-177-144/+132
| * | Merge remote-tracking branch 'phaller/execution-context' into feb17-alexPaul Phillips2012-02-1728-115/+2582
| |\ \
| | * | Disable execution context and futures implementation in the default package.Aleksandar Prokopec2012-02-168-9/+10
| | * | Merge branch 'master' into execution-contextAleksandar Prokopec2012-02-16279-8867/+10224
| | |\|
| | * | Change the default reportFailure implementation.Aleksandar Prokopec2012-02-031-2/+3
| | * | Fix typo in Future trait. Simplify recoverWith.Philipp Haller2012-02-031-5/+2
| | * | Rename to recoverWith and fallbackTo in Future.aleksandar2012-02-011-2/+2
| | * | Replaced Either with Try throughout scala.concurrent.Heather Miller2012-01-319-115/+122
| | * | Add some missing methods, remove obsolete methods in futures.aleksandar2012-01-306-36/+41
| | * | Refactor the Try monad a bit.aleksandar2012-01-301-45/+37
| | * | Changed the comments a bit, removed on* methods on Try.aleksandar2012-01-301-55/+32
| | * | Added first cut of Try type, refactored from twitter util.Heather Miller2012-01-301-0/+196
| | * | Merge branch 'execution-context' of https://github.com/phaller/scala into exe...Vojin Jovanovic2012-01-271-20/+66
| | |\ \
| | | * | Implement the ensure and andThen methods on futures.aleksandar2012-01-271-1/+56
| | | * | Change the implementation of the future failed projection.aleksandar2012-01-271-20/+11
| | * | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-25145-2662/+3127
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Removed the nondeterministic implicit. Added rescue.aleksandar2012-01-246-54/+74
| | * | | Fixed the way callbacks are handled. Removed executor from base future trait.aleksandar2012-01-234-14/+13
| | * | | Add implicit for duration.aleksandar2012-01-201-0/+7
| | * | | Add NonDeterministic evidence needed to call nondeterministic methods.aleksandar2012-01-196-54/+91
| | * | | Add implicit conversion for futures that enables calling nondeterministic met...aleksandar2012-01-194-100/+113
| | * | | Deprecating some traits in scala.concurrent.aleksandar2012-01-1910-5/+23
| | * | | Fix `all` combinator on futures, refactor execution context, remove disabled ...aleksandar2012-01-197-1262/+88
| | * | | Added implementations for any and find on collections of futures.Heather Miller2012-01-193-7/+55
| | * | | Refactor concurrent package and execution contexts.aleksandar2012-01-167-55/+101
| | * | | Work in progress.brijest2012-01-166-19/+48
| | * | | Add execution context implementation to akka futures.aleksandar2012-01-163-32/+163
| | * | | Migrate akka promises. Changes to some of the interfaces.aleksandar2012-01-139-44/+245
| | * | | Work in progress on porting akka promises and futures.aleksandar2012-01-137-184/+231