summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4300 from CodeMettle/FiniteDuration.toCoarsestLukas Rytz2015-03-232-2/+5
|\
| * Declare FiniteDuration.toCoarsest to return a FiniteDurationSteven Scott2015-02-062-2/+5
* | Merge pull request #4372 from som-snytt/issue/7775-tweakLukas Rytz2015-03-235-6/+58
|\ \
| * | SI-7775 Exclude nulls when iterating sys propsSom Snytt2015-03-025-6/+58
| |/
* | Merge pull request #4241 from kanielc/SI-6778Lukas Rytz2015-03-233-4/+11
|\ \
| * | SI-6778 scala.math.random should have parenthesisDenton Cockburn2015-01-103-4/+11
* | | Merge pull request #4368 from som-snytt/review/7784Lukas Rytz2015-03-233-2/+15
|\ \ \
| * | | SI-7784 Extend test with enum constantSom Snytt2015-02-281-0/+4
| * | | SI-7784 Allow a singleton type over a constant value defn.Jason Zaugg2015-02-283-2/+11
|/ / /
* | | Merge pull request #4362 from ms-tg/SI-9134Adriaan Moors2015-02-261-0/+25
|\ \ \
| * | | SI-9134 Verify Stream#withFilter#map lazy in tailMarc Siegel2015-02-251-0/+25
* | | | Merge pull request #4363 from retronym/topic/t8575-check-initJason Zaugg2015-02-261-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | SI-8575 Avoid use of unitialized field in a test.Jason Zaugg2015-02-261-3/+2
|/ / /
* | | Merge pull request #4284 from ms-tg/SI-8990-rebase-on-2.12-squashedAdriaan Moors2015-02-232-52/+92
|\ \ \
| * | | SI-8990 Allow GC during lazy evaluation of Stream#withFilterMarc Siegel2015-02-202-52/+92
| | |/ | |/|
* | | Merge pull request #4343 from adriaanm/reword-4267Adriaan Moors2015-02-233-36/+334
|\ \ \
| * | | SI-9113 Converting `null` collection Java<->Scala yields `null`Roman Hargrave2015-02-183-36/+334
| |/ /
* | | Merge pull request #4323 from axel22/t-concurrent-map-get-2.12.xAdriaan Moors2015-02-232-0/+87
|\ \ \
| * | | Fix SI-9147 Override `getOrElseUpdate` in `concurrent.Map`.Aleksandar Prokopec2015-02-122-0/+87
| |/ /
* | | Merge pull request #4286 from retronym/ticket/9131Adriaan Moors2015-02-233-18/+14
|\ \ \ | |/ / |/| |
| * | SI-9131 Fix use of apply syntactic sugar with by-name paramJason Zaugg2015-02-033-18/+14
|/ /
* | Merge pull request #4287 from adriaanm/ci-2.12-ide-nopAdriaan Moors2015-02-021-0/+3
|\ \
| * | Punt on IDE validation in 2.12.x...Adriaan Moors2015-02-021-0/+3
|/ /
* | Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-02-02702-3421/+13507
|\ \
| * | Refer to 2.12 in new release scriptsJason Zaugg2015-01-291-2/+2
| * | Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-01-29204-579/+3368
| |\ \
| | * \ Merge pull request #4271 from retronym/ticket/8642Adriaan Moors2015-01-283-3/+28
| | |\ \
| | | * | SI-8642 Enable OSGi tests under Java 8Jason Zaugg2015-01-281-1/+1
| | | * | Add an IntelliJ module for the Pax Exam based OSGi testsJason Zaugg2015-01-283-2/+27
| | |/ /
| | * | Merge pull request #4268 from adriaanm/new-ci-validationAdriaan Moors2015-01-285-71/+249
| | |\ \
| | | * | IDE validation: run on last commitAdriaan Moors2015-01-271-0/+32
| | | * | New PR validationAdriaan Moors2015-01-214-71/+217
| | * | | Merge pull request #4214 from som-snytt/issue/5154Jason Zaugg2015-01-222-4/+12
| | |\ \ \
| | | * | | SI-5154 Parse leading literal brace in XML patternSom Snytt2014-12-162-4/+12
| | * | | | Merge pull request #4190 from kanielc/SI-5817Jason Zaugg2015-01-222-0/+20
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | SI-5817: Add header to language.scala and languageFeature.scalaDenton Cockburn2014-12-052-0/+20
| | * | | | Merge pull request #4253 from retronym/ticket/9087Grzegorz Kossakowski2015-01-203-8/+74
| | |\ \ \ \
| | | * | | | SI-9087 Fix min/max of reversed Double/Float orderingsJason Zaugg2015-01-203-8/+74
| | * | | | | Merge pull request #4247 from adriaanm/2.11.5-bumpGrzegorz Kossakowski2015-01-203-5/+10
| | |\ \ \ \ \
| | | * | | | | Bump versions for 2.11.5 release.Adriaan Moors2015-01-042-5/+5
| | | * | | | | TODO notes for release scriptAdriaan Moors2015-01-041-0/+5
| | * | | | | | Merge pull request #4210 from lrytz/opt/classBTypeFromClassfileGrzegorz Kossakowski2015-01-1916-184/+536
| | |\ \ \ \ \ \
| | | * | | | | | Address review feedbackLukas Rytz2015-01-164-19/+44
| | | * | | | | | Construct ClassBTypes from parsed classfilesLukas Rytz2015-01-1613-101/+421
| | | * | | | | | Cleanup asm-to-string debug helpersLukas Rytz2015-01-162-14/+64
| | | * | | | | | Remove an unnecessary hash map in BTypesFromSymbolsLukas Rytz2015-01-161-12/+5
| | | * | | | | | Type alias for InternalNameLukas Rytz2015-01-162-5/+17
| | | * | | | | | Make ClassBType independent of the name tableLukas Rytz2015-01-163-60/+12
| | |/ / / / / /
| | * | | | | | Merge pull request #4249 from retronym/ticket/9089Vlad Ureche2015-01-164-1/+7
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | SI-9089 Another REPL/FSC + specialization bug fixJason Zaugg2015-01-154-1/+7