Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x | Grzegorz Kossakowski | 2013-09-05 | 16 | -5/+396 |
|\ | |||||
| * | 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 |
| | * | | SI-7150 Replace scala.reflect.internal.WeakHashSet | Grzegorz Kossakowski | 2013-09-03 | 4 | -42/+1393 |
| * | | | Merge pull request #2876 from retronym/ticket/7782 | Jason Zaugg | 2013-09-04 | 3 | -1/+58 |
| |\ \ \ | |||||
| | * | | | SI-7782 Derive type skolems at the ground level | Jason Zaugg | 2013-08-27 | 3 | -1/+58 |
| * | | | | Merge pull request #2899 from som-snytt/issue/4760-parser | Jason Zaugg | 2013-09-04 | 2 | -1/+35 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | SI-4760 Parser handles block-ending import | Som Snytt | 2013-08-30 | 2 | -1/+35 |
| * | | | | Merge pull request #2891 from som-snytt/issue/7790-no-scriptengine | Jason Zaugg | 2013-08-30 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | [nomaster] SI-7790 No ScriptEngine in 2.10 build | Som Snytt | 2013-08-29 | 1 | -0/+2 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #2897 from retronym/backport/gitignore | Jason Zaugg | 2013-08-30 | 3 | -35/+48 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Commit .gitignore directly | Jason Zaugg | 2013-08-30 | 3 | -35/+48 |
| |/ / / | |||||
| * | | | Merge pull request #2868 from retronym/ticket/7775 | Jason Zaugg | 2013-08-29 | 2 | -2/+23 |
| |\ \ \ | |||||
| | * | | | SI-7775 Harden against the shifting sands of System.getProperties | Jason Zaugg | 2013-08-26 | 2 | -2/+23 |
| * | | | | Merge pull request #2871 from retronym/ticket/7779 | Jason Zaugg | 2013-08-29 | 5 | -0/+98 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | SI-7779 Account for class name compactification in reflection | Jason Zaugg | 2013-08-23 | 5 | -0/+98 |
| | |/ / | |||||
* | | | | Merge pull request #2877 from som-snytt/issue/repl-stack-trunc | Grzegorz Kossakowski | 2013-09-04 | 7 | -15/+285 |
|\ \ \ \ | |||||
| * | | | | SI-7781 Comments to SessionTest | Som Snytt | 2013-09-02 | 1 | -5/+16 |
| * | | | | SI-7781 Improve test and add comment | Som Snytt | 2013-09-02 | 2 | -5/+13 |
| * | | | | Target junit.clean to clean junit artifacts | Som Snytt | 2013-09-02 | 1 | -1/+5 |
| * | | | | SI-7781 REPL stack trunc shows cause | Som Snytt | 2013-09-02 | 5 | -9/+256 |
|/ / / / | |||||
* | | | | Merge pull request #2864 from retronym/ticket/6240-names | Jason Zaugg | 2013-09-02 | 3 | -43/+71 |
|\ \ \ \ | |||||
| * | | | | Lock down methods in Names | Jason Zaugg | 2013-08-31 | 1 | -11/+14 |
| * | | | | SI-6240 Synchronizes Names | Jason Zaugg | 2013-08-22 | 3 | -33/+58 |
* | | | | | Merge pull request #2880 from huitseeker/update-artifactory | Grzegorz Kossakowski | 2013-08-30 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | update typesafe.artifactory-online.com to private-repo | François Garillot | 2013-08-27 | 2 | -3/+3 |
* | | | | | | Merge pull request #2861 from densh/topic/deprecate-early-type-defs | Grzegorz Kossakowski | 2013-08-30 | 9 | -8/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | deprecate early type defs | Den Shabalin | 2013-08-28 | 9 | -8/+18 |
* | | | | | | | Merge pull request #2890 from retronym/topic/one-mans-bliss | Jason Zaugg | 2013-08-30 | 1 | -10/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Paring back the scope of our shared .gitignore | Jason Zaugg | 2013-08-30 | 1 | -10/+15 |
* | | | | | | | | Merge pull request #2886 from gkossakowski/merge-2.10.x | Jason Zaugg | 2013-08-30 | 56 | -76/+558 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'scala/2.10.x' | Grzegorz Kossakowski | 2013-08-29 | 56 | -76/+558 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge pull request #2860 from retronym/merge/2.10.2-to-2.10.x | James Iry | 2013-08-26 | 18 | -30/+108 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | SI-7486 More tests for cycles triggered by implicit search | Jason Zaugg | 2013-08-21 | 2 | -0/+8 |
| | | * | | | | | | Merge remote-tracking branch 'origin/2.10.2' into merge/2.10.2-to-2.10.x | Jason Zaugg | 2013-08-21 | 18 | -30/+100 |
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | Merge pull request #2870 from retronym/ticket/7778 | Adriaan Moors | 2013-08-23 | 4 | -0/+17 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | SI-942 A test case, five years adrift. | Jason Zaugg | 2013-08-23 | 4 | -0/+17 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #2838 from retronym/ticket/7716v2.10.3-RC1 | James Iry | 2013-08-16 | 2 | -1/+19 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | SI-7716 Exclude patmat synthetics from bounds checking | Jason Zaugg | 2013-08-16 | 2 | -1/+19 |
| | * | | | | | | | Merge pull request #2842 from retronym/ticket/7603-2 | James Iry | 2013-08-16 | 2 | -30/+14 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | SI-7603 Remove diagnostic code for annotation error | Jason Zaugg | 2013-08-16 | 1 | -8/+0 |
| | | * | | | | | | | SI-7603 Fix thread safety of FlagTranslation | Jason Zaugg | 2013-08-16 | 1 | -22/+14 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Merge pull request #2814 from xeno-by/topic/auto-duplicate-expansions | James Iry | 2013-08-16 | 11 | -5/+107 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | [nomaster] macro expansions are now auto-duplicated | Eugene Burmako | 2013-08-14 | 11 | -5/+107 |
| | * | | | | | | | Merge pull request #2834 from retronym/ticket/7752 | James Iry | 2013-08-15 | 3 | -4/+60 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | SI-7752 Don't disambiguate type parameters of overloaded alts | Jason Zaugg | 2013-08-15 | 3 | -4/+60 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge pull request #2829 from adriaanm/ticket-7014 | James Iry | 2013-08-14 | 4 | -3/+29 |
| | |\ \ \ \ \ \ \ |