summaryrefslogtreecommitdiff
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'scalamacros/pullrequest/macros' into developPaul Phillips2012-02-1730-0/+167
|\
| * Fixes miscellaneous macro bugsEugene Burmako2012-02-1730-0/+167
* | Merge remote-tracking branch 'phaller/execution-context' into feb17-alexPaul Phillips2012-02-175-1/+943
|\ \
| * | Disable execution context and futures implementation in the default package.Aleksandar Prokopec2012-02-164-19/+20
| * | Merge branch 'master' into execution-contextAleksandar Prokopec2012-02-16346-698/+6271
| |\|
| * | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-2581-60/+5573
| |\ \
| * | | Migrate akka promises. Changes to some of the interfaces.aleksandar2012-01-131-7/+5
| * | | Port of akka Future implementation in progress.aleksandar2012-01-121-1/+14
| * | | Refactor await calls for awaitable objects to ready and result calls.aleksandar2012-01-121-37/+49
| * | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-09105-136/+1401
| |\ \ \
| * | | | Make base TCK more uniform with Akka TCKPhilipp Haller2011-12-131-3/+4
| * | | | Add test for recover to Akka TCKPhilipp Haller2011-12-132-4/+25
| * | | | Force output of exception in assert. Add tests for recover.Philipp Haller2011-12-131-2/+33
| * | | | Add tests for blocking/await to Akka version of the TCKPhilipp Haller2011-12-131-6/+37
| * | | | Merge branch 'execution-context' of github.com:phaller/scala into execution-c...aleksandar2011-12-131-0/+338
| |\ \ \ \
| | * | | | Add Akka version of Futures TCK.Philipp Haller2011-12-131-0/+338
| * | | | | Change promise method signature.aleksandar2011-12-131-1/+1
| |/ / / /
| * | | | Add test cases for blocking. Fix in the failed projection.aleksandar2011-12-131-3/+27
| * | | | Rename block->await. Add more tck test cases.aleksandar2011-12-131-8/+87
| * | | | Add stubs for future combinator tests.Philipp Haller2011-12-131-1/+67
| * | | | Fix default.ExecutionContextImpl.promise. Add promise test.Philipp Haller2011-12-131-1/+24
| * | | | Adding the tck test file.aleksandar2011-12-121-0/+166
| * | | | Merge branch 'execution-context' of github.com:phaller/scala into execution-c...aleksandar2011-12-121-8/+7
| |\ \ \ \
| | * | | | Fix future testsPhilipp Haller2011-12-091-5/+5
| * | | | | Syntax changes for the scala.concurrent package and some cleanup.aleksandar2011-12-121-5/+10
| |/ / / /
| * | | | Add tests for future callbacksPhilipp Haller2011-12-072-0/+134
* | | | | Merge branch 'develop'Paul Phillips2012-02-177-3/+88
|\ \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-. \ \ \ \ Merge remote-tracking branches 'VladUreche/issue/5005', 'adriaanm/topic/virtp...Paul Phillips2012-02-176-2/+83
| |\ \ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | [vpm] generate proper isDefinedAt for switchesAdriaan Moors2012-02-172-1/+26
| | * | | | | [vpm] working type switch for try/catchAdriaan Moors2012-02-174-1/+57
| | |/ / / /
| * / / / / Prevent extaneous output in SI-5005Vlad Ureche2012-02-161-1/+5
| |/ / / /
* / / / / Fixed AnyRef specialization.Paul Phillips2012-02-178-2/+108
|/ / / /
* | | | Merge remote-tracking branch 'erikrozendaal/SI-5331' into developPaul Phillips2012-02-154-32/+554
|\ \ \ \
| * | | | Custom implementations of drop/take/slice.Erik Rozendaal2012-01-232-5/+31
| * | | | Custom coded version of range/from/to/until.Erik Rozendaal2012-01-211-16/+10
| * | | | Optimized implementation of TreeMap/TreeSet#to method.Erik Rozendaal2012-01-153-13/+54
| * | | | Test for maximum height of red-black tree.Erik Rozendaal2012-01-081-0/+5
| * | | | Fix silly copy-paste error.Erik Rozendaal2012-01-071-9/+9
| * | | | Tests for takeWhile/dropWhile/span.Erik Rozendaal2012-01-072-0/+30
| * | | | Renamed object RedBlack to RedBlackTree.Erik Rozendaal2012-01-072-56/+269
| * | | | Restore old RedBlack class to maintain backwards compatibility.Erik Rozendaal2012-01-061-28/+28
| * | | | Optimize foreach and iterators.Erik Rozendaal2012-01-042-0/+32
| * | | | Use null to represent empty trees. Removed Empty/NonEmpty classes.Erik Rozendaal2012-01-031-56/+56
| * | | | Added some tests for TreeMap/TreeSet.Erik Rozendaal2011-12-282-0/+182
| * | | | Made RedBlack private to the scala.collection.immutable package.Erik Rozendaal2011-12-281-6/+9
| * | | | Make sure the redblack test compiles and runs.Erik Rozendaal2011-12-281-40/+36
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge remote-tracking branches 'axel22/issue/5293', 'szabolcsberecz/synchroni...Paul Phillips2012-02-157-4/+726
|\ \ \ \ \ \ \
| | | * | | | | Added test files to verify previous commit.Erik Osheim2012-02-152-0/+56
| | * | | | | | test to check for proper synchronization in generated codeSzabolcs Berecz2012-02-153-0/+578
| |/ / / / / / |/| | | | | |
| * | | | | | Apply the fix for si-5293 to hash maps.Aleksandar Prokopec2012-02-152-4/+92
| |/ / / / /