Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | Merge pull request #5444 from retronym/topic/typer-debug | Jason Zaugg | 2016-10-16 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | Avoid tripping cyclic errors under -Ytyper-debug | Jason Zaugg | 2016-10-07 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge 2.11.x into 2.12.x | Adriaan Moors | 2016-10-18 | 3 | -17/+23 | |
| |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge pull request #5405 from getfreebirdinc/2.11.x | Seth Tisue | 2016-09-16 | 2 | -9/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | In ProcessBuilder docs, replace .lines w/ .lineStream | Paul Kernfeld | 2016-09-16 | 2 | -9/+9 | |
| | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge pull request #5199 from dwijnand/remove-scala-lang | Stefan Zeiger | 2016-07-18 | 1 | -10/+14 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | Make removing forkjoin dependant on the organization key | Dale Wijnand | 2016-06-20 | 1 | -10/+14 | |
| | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| * | | | | | | | | | | Merge 2.11.x into 2.12.x, skipping #5236 | Adriaan Moors | 2016-10-18 | 0 | -0/+0 | |
| |\| | | | | | | | | | ||||||
| | * | | | | | | | | | Merge pull request #5236 from som-snytt/issue/triple-backport | Lukas Rytz | 2016-07-13 | 2 | -1/+9 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Avoid triple-quoting triple quotes | Som Snytt | 2016-06-17 | 2 | -1/+9 | |
* | | | | | | | | | | | Merge pull request #5468 from SethTisue/mima-0.1.11 | Seth Tisue | 2016-10-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | dogfood the new MiMa | Seth Tisue | 2016-10-19 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5471 from VEINHORN/patch-1 | Seth Tisue | 2016-10-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix typo in GenTraversableLike | Boris Korogvich | 2016-10-20 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5465 from adriaanm/licensee | Adriaan Moors | 2016-10-18 | 10 | -15563/+32 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Duplicate license in /LICENSE for GitHub | Adriaan Moors | 2016-10-18 | 10 | -15563/+32 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5386 from dwijnand/sbt-0.13.12 | Seth Tisue | 2016-10-18 | 3 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Bump sbt.version to 0.13.12, without breaking | Dale Wijnand | 2016-09-22 | 3 | -2/+7 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5462 from retronym/topic/perm-size-be-gone | Seth Tisue | 2016-10-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Avoid use of legacy JVM MaxPermSize option in partest | Jason Zaugg | 2016-10-18 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5458 from retronym/merge/2.12.0-to-2.12.x | Seth Tisue | 2016-10-14 | 41 | -356/+620 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'origin/2.12.0' into merge/2.12.0-to-2.12.x | Jason Zaugg | 2016-10-14 | 41 | -356/+620 | |
|/| | | | | | | | | ||||||
| * | | | | | | | | Make stability test optional. | Adriaan Moors | 2016-10-13 | 1 | -3/+15 | |
| * | | | | | | | | Make sbtBuildTask configurable in bootstrap | Adriaan Moors | 2016-10-13 | 1 | -1/+1 | |
| * | | | | | | | | Merge pull request #5457 from retronym/topic/restarr | Adriaan Moors | 2016-10-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Restarr to fix InterfaceMethodRef after closure inlining | Jason Zaugg | 2016-10-13 | 1 | -1/+1 | |
| * | | | | | | | | | Merge pull request #5456 from adriaanm/i244 | Adriaan Moors | 2016-10-13 | 5 | -23/+31 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Detect clash of mixedin val and existing member. | Adriaan Moors | 2016-10-12 | 5 | -23/+31 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge pull request #5429 from lrytz/sd224 | Adriaan Moors | 2016-10-11 | 22 | -80/+428 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Test cases for super calls | Lukas Rytz | 2016-09-30 | 2 | -0/+308 | |
| | * | | | | | | | | Default -Xmixin-force-forwarders to true | Lukas Rytz | 2016-09-30 | 11 | -43/+57 | |
| | * | | | | | | | | Explicit SerialVersionUID for all ClassTags / Manifests | Lukas Rytz | 2016-09-30 | 5 | -16/+38 | |
| | * | | | | | | | | re-enable two tests (starr is up to date now) | Lukas Rytz | 2016-09-30 | 6 | -20/+12 | |
| | * | | | | | | | | Error message for super calls to indirect java parent interfaces | Lukas Rytz | 2016-09-30 | 2 | -2/+14 | |
| * | | | | | | | | | Merge pull request #5442 from adriaanm/t9943 | Adriaan Moors | 2016-10-11 | 3 | -2/+12 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | SI-9943 final/sealed class does not yield SAM type | Adriaan Moors | 2016-10-04 | 3 | -2/+12 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #5452 from lrytz/sd242 | Adriaan Moors | 2016-10-10 | 2 | -2/+14 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix the interface flag when re-writing a closure call to the body method | Lukas Rytz | 2016-10-09 | 2 | -2/+14 | |
| * | | | | | | | | | | Merge pull request #5445 from retronym/ticket/9946b | Adriaan Moors | 2016-10-10 | 7 | -73/+118 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | SI-9946 don't null field in lazy accessors that turn out to be live | Jason Zaugg | 2016-10-07 | 6 | -73/+104 | |
| | * | | | | | | | | | SI-9946 make nullification of lazy val dependencies module aware | Jason Zaugg | 2016-10-07 | 2 | -1/+15 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #5443 from SethTisue/disable-SI-5293-tests | Seth Tisue | 2016-10-06 | 2 | -171/+0 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | SI-5293 delete flaky collection performance tests | Seth Tisue | 2016-10-06 | 2 | -171/+0 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24 | Seth Tisue | 2016-10-05 | 47 | -219/+712 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24 | Seth Tisue | 2016-10-04 | 17 | -108/+215 | |
| |\| | | | | | | | ||||||
| | * | | | | | | | Update keypair used to rsync spec to chara | Adriaan Moors | 2016-09-29 | 2 | -19/+77 | |
| | * | | | | | | | Merge pull request #5438 from SethTisue/spec-2.12 | Seth Tisue | 2016-09-29 | 3 | -4/+4 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | capitalize GitHub correctly | Seth Tisue | 2016-09-29 | 2 | -2/+2 | |
| | | * | | | | | | | bump version number in spec from 2.11 to 2.12 | Seth Tisue | 2016-09-29 | 3 | -4/+4 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Merge pull request #5437 from SethTisue/spec-2.12 | Adriaan Moors | 2016-09-29 | 2 | -2/+2 | |
| | |\ \ \ \ \ \ \ |