Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3052 from som-snytt/issue/6026-javap-loading | Jason Zaugg | 2013-10-23 | 1 | -12/+16 |
|\ | |||||
| * | SI-6026 REPL checks for javap before tools.jar | Som Snytt | 2013-10-18 | 1 | -12/+16 |
* | | Merge pull request #3065 from retronym/ticket/7295 | Jason Zaugg | 2013-10-23 | 1 | -7/+10 |
|\ \ | |/ |/| | |||||
| * | SI-7295 Fix windows batch file with args containing parentheses | Jason Zaugg | 2013-10-21 | 1 | -7/+10 |
|/ | |||||
* | Merge pull request #3043 from retronym/topic/flaky | Jason Zaugg | 2013-10-17 | 8 | -0/+0 |
|\ | |||||
| * | Disable tests for SI-7020 | Jason Zaugg | 2013-10-17 | 3 | -0/+0 |
| * | Disable flaky presentation compiler test. | Jason Zaugg | 2013-10-17 | 5 | -0/+0 |
|/ | |||||
* | Merge pull request #2985 from retronym/ticket/7783 | Jason Zaugg | 2013-10-03 | 6 | -11/+38 |
|\ | |||||
| * | SI-7783 Don't issue deprecation warnings for inferred TypeTrees | Jason Zaugg | 2013-09-27 | 6 | -11/+38 |
* | | Merge pull request #3009 from adriaanm/2.10.4 | Jason Zaugg | 2013-10-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | Bump version to 2.10.4 for nightlies | Adriaan Moors | 2013-10-01 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2983 from retronym/merge/2.10.3-to-2.10.x | Jason Zaugg | 2013-09-24 | 4 | -13/+119 |
|\ \ | |/ |/| | |||||
| * | Merge remote-tracking branch 'origin/2.10.3' into merge/2.10.3-to-2.10.x | Jason Zaugg | 2013-09-24 | 4 | -13/+119 |
|/| | |||||
| * | Merge pull request #2976 from retronym/backport/7862v2.10.3-RC3v2.10.3 | Jason Zaugg | 2013-09-23 | 1 | -6/+48 |
| |\ | |||||
| | * | [nomaster] SI-7862: MANIFEST.MF file for Scala sources | Iulian Dragos | 2013-09-23 | 1 | -6/+48 |
| |/ | |||||
| * | Merge pull request #2969 from retronym/ticket/7861 | Jason Zaugg | 2013-09-21 | 3 | -7/+71 |
| |\ | |||||
| | * | SI-7861 Don't execute internal callbacks on the user Executor | Jason Zaugg | 2013-09-21 | 3 | -7/+71 |
| |/ | |||||
| * | Merge pull request #2906 from retronym/merge/2.10.x-to-2.10.3v2.10.3-RC2 | Grzegorz Kossakowski | 2013-09-12 | 52 | -319/+2169 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3 | Jason Zaugg | 2013-09-12 | 26 | -225/+412 |
| | |\ | |||||
| | * | | Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3 | Jason Zaugg | 2013-09-04 | 30 | -94/+1757 |
| |/| | | |||||
| * | | | Merge pull request #2878 from JamesIry/2.10.3 | James Iry | 2013-08-27 | 18 | -30/+100 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '2.10.2' into 2.10.3 | James Iry | 2013-08-26 | 18 | -30/+100 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge pull request #2919 from retronym/ticket/7815 | Jason Zaugg | 2013-09-23 | 2 | -2/+32 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | SI-7815 Dealias before deeming method type as dependent | Jason Zaugg | 2013-09-07 | 2 | -2/+32 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2893 from adriaanm/backport-2880-2.10.x | Grzegorz Kossakowski | 2013-09-11 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | update typesafe.artifactory-online.com to private-repo | François Garillot | 2013-08-29 | 2 | -3/+3 |
* | | | | | | Merge pull request #2882 from adriaanm/license-cleanup-2.10.x | Grzegorz Kossakowski | 2013-09-11 | 1 | -32/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Change Scala license to unmodified 3-clause BSD. | Adriaan Moors | 2013-09-03 | 1 | -32/+24 |
* | | | | | | | Merge pull request #2923 from retronym/ticket/7825 | Grzegorz Kossakowski | 2013-09-11 | 6 | -6/+73 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7398 Enable test for Java 8 source parser under Java 8 | Jason Zaugg | 2013-09-10 | 1 | -4/+2 |
| * | | | | | | | SI-7825 Consider DEFAULTMETHOD when refchecking concreteness | Jason Zaugg | 2013-09-10 | 5 | -2/+71 |
* | | | | | | | | Merge pull request #2916 from retronym/ticket/7818 | Jason Zaugg | 2013-09-10 | 2 | -1/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7818 Cast our way out of extended existential angst | Jason Zaugg | 2013-09-06 | 2 | -1/+16 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2922 from huitseeker/issue/7767 | Jason Zaugg | 2013-09-10 | 3 | -0/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #1 from retronym/ticket/7767-test | François Garillot | 2013-09-09 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | SI-7767 Test case for Scaladoc on early initializers | Jason Zaugg | 2013-09-09 | 2 | -0/+21 |
| |/ / / / / / / / | |||||
| * | / / / / / / | SI-7767 avoid rejecting Scaladoc comments in early initializers | François Garillot | 2013-09-09 | 1 | -0/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2866 from retronym/ticket/7269 | Jason Zaugg | 2013-09-09 | 3 | -3/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | SI-7269 Rework MapLike#retains to account for desugaring change | Jason Zaugg | 2013-08-29 | 3 | -3/+37 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #2911 from retronym/ticket/7814 | Jason Zaugg | 2013-09-09 | 7 | -167/+214 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | SI-7814 Updates the instrumented version of ScalaRuntime. | Jason Zaugg | 2013-09-05 | 5 | -156/+70 |
| * | | | | | | | SI-7814 Avoid init cycle between Predef, `package`, ScalaRuntime | Jason Zaugg | 2013-09-05 | 3 | -11/+144 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2895 from som-snytt/issue/7652-tools-jar-backport | Grzegorz Kossakowski | 2013-09-08 | 2 | -13/+24 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | [nomaster] SI-7652 REPL extended quest for tools | Som Snytt | 2013-08-29 | 1 | -12/+23 |
| * | | | | | | [nomaster] SI-7652 Bad tools fails loudly | Som Snytt | 2013-08-29 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #2888 from xeno-by/topic/typed-annotated | Jason Zaugg | 2013-09-04 | 4 | -1/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | typedAnnotated no longer emits nulls | Eugene Burmako | 2013-08-29 | 4 | -1/+22 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #2901 from gkossakowski/backport-uniques-memory-fix | Grzegorz Kossakowski | 2013-09-04 | 6 | -54/+1446 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Modify perRunCaches to not leak WeakReferences | James Iry | 2013-09-03 | 1 | -10/+3 |
| * | | | | | | SI-7149 Use a WeakHashSet for type uniqueness | Grzegorz Kossakowski | 2013-09-03 | 3 | -2/+50 |