Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge commit 'd93826f278' into pr/enter-elimination-mode | Paul Phillips | 2013-05-18 | 17 | -527/+633 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Incorporated reviewer feedback. | Paul Phillips | 2013-05-16 | 4 | -62/+60 | |
| | * | | | Merge branch 'master' into HEAD | Paul Phillips | 2013-05-16 | 64 | -857/+396 | |
| | |\ \ \ | ||||||
| | * | | | | Incorporated reviewer feedback. | Paul Phillips | 2013-05-11 | 3 | -34/+35 | |
| | * | | | | Refactored stabilize. | Paul Phillips | 2013-05-11 | 4 | -85/+128 | |
| | * | | | | Eliminated HKmode. | Paul Phillips | 2013-05-11 | 4 | -44/+53 | |
| | * | | | | Eliminated RETmode. | Paul Phillips | 2013-05-11 | 4 | -10/+14 | |
| | * | | | | Eliminated SNDTRYmode. | Paul Phillips | 2013-05-11 | 5 | -28/+38 | |
| | * | | | | Started eliminating modes. | Paul Phillips | 2013-05-11 | 5 | -111/+118 | |
| | * | | | | Corralling Modes into a smaller pen. | Paul Phillips | 2013-05-11 | 11 | -261/+300 | |
* | | | | | | Merge pull request #2571 from paulp/pr/canonicalize-paths | Paul Phillips | 2013-05-20 | 2 | -6/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Harden partest against duplicate paths. | Paul Phillips | 2013-05-20 | 2 | -6/+15 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2562 from som-snytt/issue/double-pluginv2.11.0-M3 | Jason Zaugg | 2013-05-20 | 64 | -150/+137 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | SI-7494 Tests for status quo | Som Snytt | 2013-05-19 | 63 | -143/+133 | |
| * | | | | | SI-7494 Each plugin must only be instantiated once. | Som Snytt | 2013-05-18 | 1 | -7/+4 | |
* | | | | | | Merge pull request #2566 from paulp/pr/nondeterminism | Paul Phillips | 2013-05-19 | 4 | -3/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | An attempt to make tests deterministic. | Paul Phillips | 2013-05-19 | 4 | -3/+8 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2565 from paulp/issue/7427 | Paul Phillips | 2013-05-19 | 4 | -19/+22 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | SI-7427 stop crashing under -Ydebug. | Paul Phillips | 2013-05-19 | 4 | -19/+22 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2556 from adriaanm/merge-2.10.x | Adriaan Moors | 2013-05-17 | 12 | -17/+65 | |
|\ \ \ \ \ | ||||||
| * | | | | | Merge 2.10.x into master | Adriaan Moors | 2013-05-17 | 12 | -17/+65 | |
|/| | | | | | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge pull request #2540 from adriaanm/ticket-7201v2.10.2-RC1 | Adriaan Moors | 2013-05-17 | 4 | -1/+12 | |
| |\ \ \ \ | ||||||
| | * | | | | SI-7201 scaladoc url in scala-(library,actors,swing,reflect) pom | Adriaan Moors | 2013-05-17 | 4 | -1/+12 | |
| * | | | | | Merge pull request #2530 from kzys/jira-6424 | Adriaan Moors | 2013-05-17 | 1 | -9/+25 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | SI-6424 Scaladoc: Use mapNodes.get(_) to avoid NoSuchElementException | Kato Kazuyoshi | 2013-05-15 | 1 | -9/+25 | |
| * | | | | | | Merge pull request #2549 from vigdorchik/slash_slash | Adriaan Moors | 2013-05-17 | 1 | -4/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Prevent slash duplication. | Eugene Vigdorchik | 2013-05-17 | 1 | -4/+1 | |
| * | | | | | | | Merge pull request #2536 from adriaanm/ticket-7359 | Adriaan Moors | 2013-05-17 | 6 | -81/+32 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | [backport #1727] SI-7359 cyclic nested java class | Adriaan Moors | 2013-05-16 | 6 | -81/+32 | |
| | | |_|/ / / / | | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #2553 from paulp/issue/7486 | Adriaan Moors | 2013-05-17 | 2 | -3/+15 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | SI-7486 regression in implicit resolution. | Paul Phillips | 2013-05-17 | 2 | -3/+15 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #2550 from scalamacros/2.10.x | Jason Zaugg | 2013-05-17 | 1 | -0/+3 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | [nomaster] unbreaks test.bc | Eugene Burmako | 2013-05-17 | 1 | -0/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2555 from soc/SI-7492 | Adriaan Moors | 2013-05-17 | 3 | -217/+113 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | SI-7492 Remove -Ystruct-dispatch and associated code | Simon Ochsenreither | 2013-05-17 | 3 | -217/+113 | |
* | | | | | | | | Merge pull request #2518 from paulp/issue/1786 | Adriaan Moors | 2013-05-17 | 4 | -35/+59 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | No bounds-driven inference for the named. | Paul Phillips | 2013-05-14 | 3 | -8/+12 | |
| * | | | | | | | | SI-1786 incorporate defined bounds in inference | Paul Phillips | 2013-05-12 | 5 | -40/+60 | |
* | | | | | | | | | Merge pull request #2541 from rjolly/scripting11 | Adriaan Moors | 2013-05-17 | 1 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ScriptEngine.eval() forwards Error instead of new ScriptException | Raphael Jolly | 2013-05-16 | 1 | -1/+9 | |
* | | | | | | | | | | Merge pull request #2544 from viktorklang/wip-normalize-parameter-names-in-sc... | Adriaan Moors | 2013-05-17 | 4 | -31/+31 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Deprecate parameter names in scala.concurrent | Viktor Klang | 2013-05-16 | 4 | -31/+31 | |
* | | | | | | | | | | | Merge pull request #2539 from soc/SI-7484 | Adriaan Moors | 2013-05-17 | 5 | -48/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | SI-7484 Indentation and whitespace fixes | Simon Ochsenreither | 2013-05-17 | 5 | -51/+30 | |
| * | | | | | | | | | | | SI-7484 Add @SupressWarning(rawtypes/unchecked) | Simon Ochsenreither | 2013-05-17 | 3 | -0/+4 | |
* | | | | | | | | | | | | Merge pull request #2538 from som-snytt/issue/6488-process-io-destroy | Adriaan Moors | 2013-05-17 | 4 | -15/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | SI-6488 Interrupt i/o threads on process destroy | Som Snytt | 2013-05-15 | 4 | -15/+75 | |
* | | | | | | | | | | | | | Merge pull request #2554 from paulp/merge/v2.10.1-326-g4f8c306-to-master | Adriaan Moors | 2013-05-17 | 73 | -1291/+2518 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master | Jason Zaugg | 2013-05-17 | 2891 | -80543/+42569 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | / / / / / / | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #2504 from scalamacros/ticket/7464 | Jason Zaugg | 2013-05-17 | 4 | -14/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ |