summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Merge pull request #5444 from retronym/topic/typer-debugJason Zaugg2016-10-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Avoid tripping cyclic errors under -Ytyper-debugJason Zaugg2016-10-071-1/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge 2.11.x into 2.12.xAdriaan Moors2016-10-183-17/+23
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge pull request #5405 from getfreebirdinc/2.11.xSeth Tisue2016-09-162-9/+9
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | In ProcessBuilder docs, replace .lines w/ .lineStreamPaul Kernfeld2016-09-162-9/+9
| | |/ / / / / / / / /
| | * | | | | | | | | Merge pull request #5199 from dwijnand/remove-scala-langStefan Zeiger2016-07-181-10/+14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make removing forkjoin dependant on the organization keyDale Wijnand2016-06-201-10/+14
| | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge 2.11.x into 2.12.x, skipping #5236Adriaan Moors2016-10-180-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #5236 from som-snytt/issue/triple-backportLukas Rytz2016-07-132-1/+9
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Avoid triple-quoting triple quotesSom Snytt2016-06-172-1/+9
* | | | | | | | | | | Merge pull request #5468 from SethTisue/mima-0.1.11Seth Tisue2016-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | dogfood the new MiMaSeth Tisue2016-10-191-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5471 from VEINHORN/patch-1Seth Tisue2016-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix typo in GenTraversableLikeBoris Korogvich2016-10-201-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5465 from adriaanm/licenseeAdriaan Moors2016-10-1810-15563/+32
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Duplicate license in /LICENSE for GitHubAdriaan Moors2016-10-1810-15563/+32
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5386 from dwijnand/sbt-0.13.12Seth Tisue2016-10-183-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-09-223-2/+7
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #5462 from retronym/topic/perm-size-be-goneSeth Tisue2016-10-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Avoid use of legacy JVM MaxPermSize option in partestJason Zaugg2016-10-181-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5458 from retronym/merge/2.12.0-to-2.12.xSeth Tisue2016-10-1441-356/+620
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/2.12.0' into merge/2.12.0-to-2.12.xJason Zaugg2016-10-1441-356/+620
|/| | | | | | | |
| * | | | | | | | Make stability test optional.Adriaan Moors2016-10-131-3/+15
| * | | | | | | | Make sbtBuildTask configurable in bootstrapAdriaan Moors2016-10-131-1/+1
| * | | | | | | | Merge pull request #5457 from retronym/topic/restarrAdriaan Moors2016-10-131-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Restarr to fix InterfaceMethodRef after closure inliningJason Zaugg2016-10-131-1/+1
| * | | | | | | | | Merge pull request #5456 from adriaanm/i244Adriaan Moors2016-10-135-23/+31
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Detect clash of mixedin val and existing member.Adriaan Moors2016-10-125-23/+31
| |/ / / / / / / /
| * | | | | | | | Merge pull request #5429 from lrytz/sd224Adriaan Moors2016-10-1122-80/+428
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Test cases for super callsLukas Rytz2016-09-302-0/+308
| | * | | | | | | | Default -Xmixin-force-forwarders to trueLukas Rytz2016-09-3011-43/+57
| | * | | | | | | | Explicit SerialVersionUID for all ClassTags / ManifestsLukas Rytz2016-09-305-16/+38
| | * | | | | | | | re-enable two tests (starr is up to date now)Lukas Rytz2016-09-306-20/+12
| | * | | | | | | | Error message for super calls to indirect java parent interfacesLukas Rytz2016-09-302-2/+14
| * | | | | | | | | Merge pull request #5442 from adriaanm/t9943Adriaan Moors2016-10-113-2/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | SI-9943 final/sealed class does not yield SAM typeAdriaan Moors2016-10-043-2/+12
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #5452 from lrytz/sd242Adriaan Moors2016-10-102-2/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix the interface flag when re-writing a closure call to the body methodLukas Rytz2016-10-092-2/+14
| * | | | | | | | | | Merge pull request #5445 from retronym/ticket/9946bAdriaan Moors2016-10-107-73/+118
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | SI-9946 don't null field in lazy accessors that turn out to be liveJason Zaugg2016-10-076-73/+104
| | * | | | | | | | | SI-9946 make nullification of lazy val dependencies module awareJason Zaugg2016-10-072-1/+15
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #5443 from SethTisue/disable-SI-5293-testsSeth Tisue2016-10-062-171/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | SI-5293 delete flaky collection performance testsSeth Tisue2016-10-062-171/+0
| |/ / / / / / / /
* | | | | | | | | Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-0547-219/+712
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-0417-108/+215
| |\| | | | | | |
| | * | | | | | | Update keypair used to rsync spec to charaAdriaan Moors2016-09-292-19/+77
| | * | | | | | | Merge pull request #5438 from SethTisue/spec-2.12Seth Tisue2016-09-293-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | capitalize GitHub correctlySeth Tisue2016-09-292-2/+2
| | | * | | | | | | bump version number in spec from 2.11 to 2.12Seth Tisue2016-09-293-4/+4
| | |/ / / / / / /
| | * | | | | | | Merge pull request #5437 from SethTisue/spec-2.12Adriaan Moors2016-09-292-2/+2
| | |\ \ \ \ \ \ \