summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2502 from viktorklang/wip-SI7383-EC-prepare-in-Future-app...Adriaan Moors2013-05-142-1/+20
|\
| * SI-7383 - Call ExecutionContext.prepare in Future.apply to allow for capturin...Viktor Klang2013-05-102-1/+20
* | Merge pull request #2500 from phaller/topic/forkjoin-updateJason Zaugg2013-05-126-1085/+1964
|\ \
| * | SI-7442 Update bundled Fork/Join pool (JSR166y)Philipp Haller2013-05-116-1085/+1964
* | | Merge pull request #2494 from scalamacros/ticket/5923Eugene Burmako2013-05-1155-72/+466
|\ \ \
| * | | [nomaster] removes duplication in inferImplicitValueEugene Burmako2013-05-113-50/+28
| * | | [nomaster] SI-7166 catches DivergentImplicit in c.inferImplicitXXXEugene Burmako2013-05-115-20/+71
| * | | [nomaster] SI-7047 fixes silent for c.inferImplicitXXXEugene Burmako2013-05-115-2/+30
| * | | [nomaster] SI-7291: No exception throwing for diverging implicit expansionHubert Plociniczak2013-05-1117-14/+171
| * | | [nomaster] SI-7167 implicit macros decide what is divergenceEugene Burmako2013-05-1113-16/+102
| * | | [nomaster] macroExpandAll is now triggered in all invocations of typedEugene Burmako2013-05-114-5/+17
| * | | [nomaster] SI-5923 instantiates targs in deferred macro applicationsEugene Burmako2013-05-1116-11/+93
| * | | [nomaster] temporarily breaks SI-5353Eugene Burmako2013-05-112-0/+0
| |/ /
* | | Merge pull request #2496 from igormoreno/2.10.xPaul Phillips2013-05-111-1/+1
|\ \ \
| * | | Scaladoc: fixing small typo in PartialFunction.scalaIgor Moreno2013-05-051-1/+1
* | | | Merge pull request #2505 from scalamacros/topic/macrosPaul Phillips2013-05-115-31/+67
|\ \ \ \ | |_|/ / |/| | |
| * | | pull request feedbackEugene Burmako2013-05-112-6/+9
| * | | replaces inferBootClasspath with a simple lookup at sun.boot.class.pathEugene Burmako2013-05-091-12/+1
| * | | removes the traces of always on debug diagnosticsEugene Burmako2013-05-092-21/+21
| * | | fixes a crash in ReflectionUtils.systemPropertiesEugene Burmako2013-05-093-2/+46
| | |/ | |/|
* | | Merge pull request #2513 from scalamacros/topic/210x-breakageGrzegorz Kossakowski2013-05-111-1/+1
|\ \ \
| * | | fixes a checkfile breakage in 2.10.xEugene Burmako2013-05-111-1/+1
|/ / /
* | | Merge pull request #2481 from martinmcnulty/socket-timeoutGrzegorz Kossakowski2013-05-111-2/+27
|\ \ \
| * | | SI-5734 Allow setting of socket timeout for remote actorsMartin McNulty2013-05-031-2/+27
* | | | Merge pull request #2456 from paulp/pr/jdk8-210xGrzegorz Kossakowski2013-05-1116-23/+84
|\ \ \ \
| * | | | SI-7398 Add support for java8 default methodsPaul Phillips2013-04-266-7/+54
| * | | | Refactor DirectTest so java can be tested.Paul Phillips2013-04-2610-16/+30
* | | | | Merge pull request #2461 from scalamacros/ticket/7325Paul Phillips2013-05-1015-66/+223
|\ \ \ \ \
| * | | | | literal() now assigns a position to the tree it producesEugene Burmako2013-05-041-31/+32
| * | | | | SI-7325 cleans up corner cases of percent handling in StringContext.fEugene Burmako2013-05-049-33/+141
| * | | | | SI-7271 fixes positions of string interpolation partsEugene Burmako2013-04-276-6/+54
| |/ / / /
* | | | | Merge pull request #2458 from paulp/issue/7426-210Grzegorz Kossakowski2013-05-102-1/+3
|\ \ \ \ \
| * | | | | SI-7426 Crash in pickler.Paul Phillips2013-04-262-1/+3
* | | | | | Merge pull request #2473 from paulp/pr/2.10.2/5634Paul Phillips2013-05-101-32/+21
|\ \ \ \ \ \
| * | | | | | SI-5634 eliminate overly verbose error messagePaul Phillips2013-04-301-32/+21
* | | | | | | Merge pull request #2488 from paulp/issue/7441Paul Phillips2013-05-103-6/+28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | SI-7441 Don't ramble on about inapplicable implicits.Paul Phillips2013-05-023-6/+28
* | | | | | | Merge pull request #2472 from paulp/pr/2.10.2/7385Paul Phillips2013-05-074-4/+25
|\ \ \ \ \ \ \
| * | | | | | | SI-7385 crash in erroneous codePaul Phillips2013-04-304-4/+25
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2487 from paulp/issue/6091Paul Phillips2013-05-073-2/+17
|\ \ \ \ \ \ \
| * | | | | | | SI-6091 overeager warning for reference equalityPaul Phillips2013-05-023-2/+17
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2440 from retronym/ticket/6771Adriaan Moors2013-05-035-1/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | SI-6771 Alias awareness for checkableType in match analysis.Jason Zaugg2013-04-245-1/+35
* | | | | | | Merge pull request #2475 from adriaanm/build-relative-symlinkAdriaan Moors2013-05-021-1/+3
|\ \ \ \ \ \ \
| * | | | | | | use relative symlink in distpackAdriaan Moors2013-04-301-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #2471 from paulp/pr/2.10.2/6532Paul Phillips2013-04-301-0/+2
|\ \ \ \ \ \ \
| * | | | | | | SI-6532 emit debug info in compiled java.Paul Phillips2013-04-301-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2432 from retronym/ticket/delayed-init-refPaul Phillips2013-04-304-0/+64
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Warn on selection of vals from DelayedInit subclasses.Jason Zaugg2013-04-234-0/+64
* | | | | | | Merge pull request #2439 from retronym/ticket/7369Adriaan Moors2013-04-276-11/+123
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |