summaryrefslogtreecommitdiff
path: root/test/files/jvm
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge commit 'refs/pull/401/head'; commit 'refs/pull/402/head'; commit 'refs/...Paul Phillips2012-04-143-58/+62
|\ \
| * | implements reification of tough typesEugene Burmako2012-04-143-58/+62
* | | virtpatmat on by default; chicken out: -XoldpatmatAdriaan Moors2012-04-141-1/+1
|/ /
* | Fixed tests to account for SIP 18Martin Odersky2012-04-131-369/+372
* | Merge commit 'refs/pull/375/head' into developPaul Phillips2012-04-124-383/+374
|\ \
| * | Next generation of macrosEugene Burmako2012-04-124-383/+374
| |/
* / Disabling failing tests.Paul Phillips2012-04-122-138/+0
|/
* Add tests for future combinators: map, flatMap, filter, collect, foreach, rec...phaller2012-04-041-16/+274
* Remedies Try/Either signature disparity for source compat. w/ AkkaHeather Miller2012-04-031-3/+77
* Work on source compatibility between akka and scala futures.Aleksandar Prokopec2012-03-281-1/+1
* Merge remote-tracking branch 'axel22/feature/collection-concurrent' into developPaul Phillips2012-03-272-11/+12
|\
| * Rename ConcurrentTrieMap to concurrent.TrieMap.Aleksandar Prokopec2012-03-272-11/+12
* | Cleaned up Duration for the standard library.Vojin Jovanovic2012-03-201-1/+1
|/
*-. Merge remote-tracking branches 'VladUreche/feature/inheritdoc-clean', 'acruis...Paul Phillips2012-03-1611-32/+64
|\ \
| | * Renaming Ctrie to ConcurrentTrieMap.Aleksandar Prokopec2012-03-162-11/+11
| |/ |/|
| * Fixed broken testsAlex Cruise2012-03-154-5/+6
| * SI-1118:Alex Cruise2012-03-153-31/+31
| * SI-1118 WIPAlex Cruise2012-03-156-17/+48
| * SI-1118 WIPAlex Cruise2012-03-152-0/+0
| * Merge remote-tracking branch 'odersky/topic/inline' into merge-inlinePaul Phillips2012-03-141-1/+1
| |\
| * \ Merge branch 'master' into merge-inlinePaul Phillips2012-03-146-6/+575
| |\ \ | |/ / |/| |
| * | Updated checkfiles to subtract ScalaObject.Paul Phillips2012-02-041-1/+1
* | | SI-5189 fixed: safe type infer for constr patternAdriaan Moors2012-03-091-1/+1
* | | Fix race condition in scala-concurrent-tck testPhilipp Haller2012-02-191-1/+1
* | | Disable execution context and futures implementation in the default package.Aleksandar Prokopec2012-02-163-409/+19
* | | Merge branch 'master' into execution-contextAleksandar Prokopec2012-02-162-5/+23
|\ \ \
| * | | Apply the fix for si-5293 to hash maps.Aleksandar Prokopec2012-02-151-4/+4
| | |/ | |/|
| * | Add tests for parallel Ctrie.Aleksandar Prokopec2012-02-032-0/+9
| * | Incorporate Ctrie into standard library.Aleksandar Prokopec2012-02-022-1/+10
| |/
* | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-252-3/+12
|\|
| * Preserve attribute order in inline XMLSzabolcs Berecz2012-01-141-2/+2
| * Merge branch 'master' into issue/4147aleksandar2012-01-121-1/+1
| |\
| * | Add mutable tree sets to the standard library.aleksandar2012-01-122-1/+10
* | | 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-093-6/+6
|\ \ \ | | |/ | |/|
| * | Fixed equality and string representation of xml attributes with null valueSzabolcs Berecz2012-01-071-1/+1
| |/
| * Merge remote-tracking branches 'axel22/issue/5293' and 'jsuereth/fix-5053-vie...Paul Phillips2011-12-191-1/+1
| |\
| | * Batch files no longer swallow exit codesEugene Burmako2011-12-091-1/+1
| * | Fix #5293 - changed the way hashcode is improved in hash sets.aleksandar2011-12-191-4/+4
| |/
* | 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