summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-09-2827-81/+463
|\
| * Merge pull request #5423 from lrytz/sd229Adriaan Moors2016-09-285-12/+240
| |\
| | * SI-4683 fix $outer accesses in class bodies extending DelayedInitLukas Rytz2016-09-283-2/+79
| | * SI-9697 / SD-229 Fix DelayedInit subclass capturing local valueLukas Rytz2016-09-284-11/+162
| * | Merge pull request #5397 from retronym/ticket/9920Adriaan Moors2016-09-287-2/+84
| |\ \
| | * | SI-9920 Avoid linkage errors with captured local objects + self typesJason Zaugg2016-09-277-2/+84
| * | | Merge pull request #5412 from retronym/ticket/SD-226Adriaan Moors2016-09-282-1/+19
| |\ \ \
| | * | | Make isSeparateCompiled... robust against rogue phase time travelJason Zaugg2016-09-272-3/+9
| | * | | SD-226 Be lazier in Fields info transform for better performanceJason Zaugg2016-09-212-1/+13
| | | |/ | | |/|
| * | | Merge pull request #5388 from adriaanm/issue-219Adriaan Moors2016-09-284-44/+79
| |\ \ \
| | * | | Cast more pro-actively in synthetic accessor trees.Adriaan Moors2016-09-263-53/+64
| | * | | Avoid mismatched symbols in fields phaseAdriaan Moors2016-09-262-2/+26
| | |/ /
| * | | Merge pull request #5426 from adriaanm/version-mention-lightbendAdriaan Moors2016-09-283-3/+3
| |\ \ \
| | * | | Including Lightbend in `-version` message.Adriaan Moors2016-09-273-3/+3
| |/ / /
| * | | Merge pull request #5422 from retronym/topic/restarr-synchronizedAdriaan Moors2016-09-271-1/+1
| |\ \ \
| | * | | Restarr to JITtablity of generated synchronized blocksJason Zaugg2016-09-271-1/+1
| * | | | Merge pull request #5417 from retronym/ticket/SD-233Jason Zaugg2016-09-272-1/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | SD-233 synchronized blocks are JIT-friendly againJason Zaugg2016-09-272-1/+11
| | |/ /
| * | | Merge pull request #5414 from szeiger/wip/no-partest-in-packAdriaan Moors2016-09-261-4/+4
| |\ \ \
| | * | | Do not build partest-javaagent and partest-extras for `pack`Stefan Zeiger2016-09-221-4/+4
| | | |/ | | |/|
| * | | Merge pull request #5411 from gourlaysama/ticket/sd-220-build-without-gitAdriaan Moors2016-09-262-7/+16
| |\ \ \
| | * | | SD-220 building without being in a git repositoryAntoine Gourlay2016-09-202-7/+16
| * | | | Merge pull request #5404 from rjolly/2.12.0Adriaan Moors2016-09-261-1/+1
| |\ \ \ \
| | * | | | Fixed reference to script engine factory in META-INF/servicesRaphael Jolly2016-09-161-1/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #5418 from retronym/opt/java-binary-nameJason Zaugg2016-09-273-5/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Optimize javaBinaryName callersJason Zaugg2016-09-263-5/+5
| |/ / /
* | | | Merge branch '2.12.0' into merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-09-2412-42/+46
|\| | |
| * | | Merge pull request #5403 from retronym/bootstrap/lzycomputeSeth Tisue2016-09-201-1/+1
| |\ \ \
| | * | | Restarr on PR 5398, lzycompute performance fixJason Zaugg2016-09-181-1/+1
| | |/ /
| * | | Merge pull request #5380 from SethTisue/remove-outdated-ensime-stuffLukas Rytz2016-09-203-30/+3
| |\ \ \ | | |/ / | |/| |
| | * | remove outdated ENSIME infoSeth Tisue2016-09-073-30/+3
| * | | Merge pull request #5395 from retronym/pr/5394Jason Zaugg2016-09-152-1/+17
| |\ \ \
| | * | | Avoid omitting constant typed vals in constructorsJason Zaugg2016-09-122-1/+17
| | | |/ | | |/|
| * | | Merge pull request #5398 from retronym/ticket/SD-225Jason Zaugg2016-09-155-9/+20
| |\ \ \
| | * | | SD-225 Use a "lzycompute" method for module initializationJason Zaugg2016-09-145-9/+20
| | |/ /
| * | | Merge pull request #5392 from adriaanm/t9918Lukas Rytz2016-09-143-1/+5
| |\ \ \ | | |/ / | |/| |
| | * | SI-9918 object in trait mixed into package objectAdriaan Moors2016-09-103-1/+5
| |/ /
* | | Merge pull request #5399 from szeiger/wip/ignore-jline-configsStefan Zeiger2016-09-211-2/+8
|\ \ \ | |/ / |/| |
| * | Only compare group ID and artifact ID when looking for JLine JARStefan Zeiger2016-09-141-2/+8
|/ /
* | Merge pull request #5381 from SethTisue/use-rc1-as-starrAdriaan Moors2016-09-071-2/+2
|\ \ | |/ |/|
| * bump STARR to 2.12.0-RC1Seth Tisue2016-09-061-2/+2
|/
* Merge pull request #5375 from scala/spec-typoSeth Tisue2016-09-061-1/+3
|\
| * Spec typo: hide source comment in rendered versionLukas Rytz2016-09-051-1/+3
* | Merge pull request #5368 from retronym/ticket/SD-208Adriaan Moors2016-09-064-36/+23
|\ \
| * | SD-208 Restore 2.11 names for arrayOps implicitsJason Zaugg2016-08-313-33/+11
| * | Disable stack hungry test of deprecated PagedSeqJason Zaugg2016-08-311-1/+2
| * | Use STARR library for ManMakerJason Zaugg2016-08-311-2/+1
| * | Workaround sbt bug when partest itself throwsJason Zaugg2016-08-311-1/+11
* | | Merge pull request #5377 from lrytz/sd143-relaxAdriaan Moors2016-09-062-1/+30
|\ \ \
| * | | SD-143 allow super calls to methods defined in indirect super classesJason Zaugg2016-09-052-1/+30
|/ / /