Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2502 from viktorklang/wip-SI7383-EC-prepare-in-Future-app... | Adriaan Moors | 2013-05-14 | 2 | -1/+20 |
|\ | |||||
| * | SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for capturin... | Viktor Klang | 2013-05-10 | 2 | -1/+20 |
* | | Merge pull request #2500 from phaller/topic/forkjoin-update | Jason Zaugg | 2013-05-12 | 6 | -1085/+1964 |
|\ \ | |||||
| * | | SI-7442 Update bundled Fork/Join pool (JSR166y) | Philipp Haller | 2013-05-11 | 6 | -1085/+1964 |
* | | | Merge pull request #2494 from scalamacros/ticket/5923 | Eugene Burmako | 2013-05-11 | 55 | -72/+466 |
|\ \ \ | |||||
| * | | | [nomaster] removes duplication in inferImplicitValue | Eugene Burmako | 2013-05-11 | 3 | -50/+28 |
| * | | | [nomaster] SI-7166 catches DivergentImplicit in c.inferImplicitXXX | Eugene Burmako | 2013-05-11 | 5 | -20/+71 |
| * | | | [nomaster] SI-7047 fixes silent for c.inferImplicitXXX | Eugene Burmako | 2013-05-11 | 5 | -2/+30 |
| * | | | [nomaster] SI-7291: No exception throwing for diverging implicit expansion | Hubert Plociniczak | 2013-05-11 | 17 | -14/+171 |
| * | | | [nomaster] SI-7167 implicit macros decide what is divergence | Eugene Burmako | 2013-05-11 | 13 | -16/+102 |
| * | | | [nomaster] macroExpandAll is now triggered in all invocations of typed | Eugene Burmako | 2013-05-11 | 4 | -5/+17 |
| * | | | [nomaster] SI-5923 instantiates targs in deferred macro applications | Eugene Burmako | 2013-05-11 | 16 | -11/+93 |
| * | | | [nomaster] temporarily breaks SI-5353 | Eugene Burmako | 2013-05-11 | 2 | -0/+0 |
| |/ / | |||||
* | | | Merge pull request #2496 from igormoreno/2.10.x | Paul Phillips | 2013-05-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Scaladoc: fixing small typo in PartialFunction.scala | Igor Moreno | 2013-05-05 | 1 | -1/+1 |
* | | | | Merge pull request #2505 from scalamacros/topic/macros | Paul Phillips | 2013-05-11 | 5 | -31/+67 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | pull request feedback | Eugene Burmako | 2013-05-11 | 2 | -6/+9 |
| * | | | replaces inferBootClasspath with a simple lookup at sun.boot.class.path | Eugene Burmako | 2013-05-09 | 1 | -12/+1 |
| * | | | removes the traces of always on debug diagnostics | Eugene Burmako | 2013-05-09 | 2 | -21/+21 |
| * | | | fixes a crash in ReflectionUtils.systemProperties | Eugene Burmako | 2013-05-09 | 3 | -2/+46 |
| | |/ | |/| | |||||
* | | | Merge pull request #2513 from scalamacros/topic/210x-breakage | Grzegorz Kossakowski | 2013-05-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fixes a checkfile breakage in 2.10.x | Eugene Burmako | 2013-05-11 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2481 from martinmcnulty/socket-timeout | Grzegorz Kossakowski | 2013-05-11 | 1 | -2/+27 |
|\ \ \ | |||||
| * | | | SI-5734 Allow setting of socket timeout for remote actors | Martin McNulty | 2013-05-03 | 1 | -2/+27 |
* | | | | Merge pull request #2456 from paulp/pr/jdk8-210x | Grzegorz Kossakowski | 2013-05-11 | 16 | -23/+84 |
|\ \ \ \ | |||||
| * | | | | SI-7398 Add support for java8 default methods | Paul Phillips | 2013-04-26 | 6 | -7/+54 |
| * | | | | Refactor DirectTest so java can be tested. | Paul Phillips | 2013-04-26 | 10 | -16/+30 |
* | | | | | Merge pull request #2461 from scalamacros/ticket/7325 | Paul Phillips | 2013-05-10 | 15 | -66/+223 |
|\ \ \ \ \ | |||||
| * | | | | | literal() now assigns a position to the tree it produces | Eugene Burmako | 2013-05-04 | 1 | -31/+32 |
| * | | | | | SI-7325 cleans up corner cases of percent handling in StringContext.f | Eugene Burmako | 2013-05-04 | 9 | -33/+141 |
| * | | | | | SI-7271 fixes positions of string interpolation parts | Eugene Burmako | 2013-04-27 | 6 | -6/+54 |
| |/ / / / | |||||
* | | | | | Merge pull request #2458 from paulp/issue/7426-210 | Grzegorz Kossakowski | 2013-05-10 | 2 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | SI-7426 Crash in pickler. | Paul Phillips | 2013-04-26 | 2 | -1/+3 |
* | | | | | | Merge pull request #2473 from paulp/pr/2.10.2/5634 | Paul Phillips | 2013-05-10 | 1 | -32/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SI-5634 eliminate overly verbose error message | Paul Phillips | 2013-04-30 | 1 | -32/+21 |
* | | | | | | | Merge pull request #2488 from paulp/issue/7441 | Paul Phillips | 2013-05-10 | 3 | -6/+28 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | SI-7441 Don't ramble on about inapplicable implicits. | Paul Phillips | 2013-05-02 | 3 | -6/+28 |
* | | | | | | | Merge pull request #2472 from paulp/pr/2.10.2/7385 | Paul Phillips | 2013-05-07 | 4 | -4/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-7385 crash in erroneous code | Paul Phillips | 2013-04-30 | 4 | -4/+25 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2487 from paulp/issue/6091 | Paul Phillips | 2013-05-07 | 3 | -2/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-6091 overeager warning for reference equality | Paul Phillips | 2013-05-02 | 3 | -2/+17 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2440 from retronym/ticket/6771 | Adriaan Moors | 2013-05-03 | 5 | -1/+35 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | SI-6771 Alias awareness for checkableType in match analysis. | Jason Zaugg | 2013-04-24 | 5 | -1/+35 |
* | | | | | | | Merge pull request #2475 from adriaanm/build-relative-symlink | Adriaan Moors | 2013-05-02 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use relative symlink in distpack | Adriaan Moors | 2013-04-30 | 1 | -1/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #2471 from paulp/pr/2.10.2/6532 | Paul Phillips | 2013-04-30 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | SI-6532 emit debug info in compiled java. | Paul Phillips | 2013-04-30 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #2432 from retronym/ticket/delayed-init-ref | Paul Phillips | 2013-04-30 | 4 | -0/+64 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Warn on selection of vals from DelayedInit subclasses. | Jason Zaugg | 2013-04-23 | 4 | -0/+64 |
* | | | | | | | Merge pull request #2439 from retronym/ticket/7369 | Adriaan Moors | 2013-04-27 | 6 | -11/+123 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | |