summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SI-9806 Fix incorrect codegen with optimizer, constants, try/catchJason Zaugg2016-06-072-2/+20
* Merge pull request #5214 from som-snytt/issue/7898-sbtAdriaan Moors2016-06-051-1/+4
|\
| * SI-7898 Preserve reader against subversionSom Snytt2016-06-041-1/+4
|/
* Merge pull request #4998 from som-snytt/issue/7898-iLukas Rytz2016-06-0110-78/+285
|\
| * SI-7898 Label for parsing -i sourcesLukas Rytz2016-05-244-1/+35
| * SI-7898 Report paste errors improvedlySom Snytt2016-05-233-19/+28
| * SI-7898 Quiet REPL at startupSom Snytt2016-05-221-6/+18
| * SI-7898 Read user input during REPL warmupSom Snytt2016-05-205-60/+212
* | Merge pull request #5183 from performantdata/bug/SI-9789Lukas Rytz2016-05-305-94/+257
|\ \
| * | SI-9789 use quadratic probing in OpenHashMapPerformant Data LLC2016-05-265-94/+257
|/ /
* | Merge pull request #4959 from rjolly/scripting15Stefan Zeiger2016-05-255-12/+32
|\ \
| * | Jarlist scala-library in build.sbtRaphael Jolly2016-05-212-3/+15
| * | Use jarlister in buildRaphael Jolly2016-05-213-9/+17
| |/
* | Merge pull request #5061 from performantdata/benchmark-frameworkJason Zaugg2016-05-257-0/+457
|\ \
| * | Enable full compiler optimizations in JMH benchmarking.Performant Data LLC2016-05-051-1/+1
| * | Address JMH benchmark reviewer's issues.Performant Data LLC2016-05-033-59/+61
| * | Improve the OpenHashMapBenchmark run times.Performant Data LLC2016-05-031-7/+14
| * | Add a JMH runner class to the library benchmark framework.Performant Data LLC2016-05-033-9/+167
| * | Benchmark the OpenHashMap memory usage.Performant Data LLC2016-05-034-11/+35
| * | Add get() tests to OpenHashMap, reduce timing artifacts.Performant Data LLC2016-05-031-35/+144
| * | Add a reference to Doug Lea's benchmarks.Performant Data LLC2016-05-031-1/+2
| * | Add JMH to the benchmark framework.Performant Data LLC2016-05-035-0/+156
* | | Merge pull request #5169 from som-snytt/issue/4625Lukas Rytz2016-05-2311-44/+111
|\ \ \
| * | | SI-4625 Warn on first non-toplevel onlySom Snytt2016-05-172-42/+47
| * | | SI-4625 Warn when discarding script objectSom Snytt2016-05-174-4/+27
| * | | SI-4625 Permit arbitrary top-level in scriptSom Snytt2016-05-164-1/+19
| * | | SI-4625 App is a thingSom Snytt2016-05-162-1/+5
| * | | SI-4625 Recognize App in scriptSom Snytt2016-05-164-1/+18
* | | | Merge pull request #5167 from martijnhoekstra/SI-9766Lukas Rytz2016-05-232-1/+20
|\ \ \ \
| * | | | SI-9766 - allow ++ on empty ConcatIteratorMartijn Hoekstra2016-05-212-1/+20
| |/ / /
* | | / SI-9688 Make merge in immutable HashMap1 work with null kv.Łukasz Gieroń2016-05-232-1/+49
| |_|/ |/| |
* | | Merge pull request #5178 from lrytz/readme211Adriaan Moors2016-05-203-185/+296
|\ \ \
| * | | [backport] identical readme in 2.11.x as in 2.12.xLukas Rytz2016-05-193-185/+296
|/ / /
* | | Merge pull request #5172 from lrytz/move-testJason Zaugg2016-05-172-0/+0
|\ \ \
| * | | Move t8449 to correct placeLukas Rytz2016-05-172-0/+0
* | | | Remove default value for sourcepath in scalac (ant version). (#5166)Krzysztof Romanowski2016-05-171-2/+0
|/ / /
* | | Merge pull request #5152 from retronym/topic/silencioJason Zaugg2016-05-173-9/+46
|\ \ \ | |/ / |/| |
| * | [backport] sbt build targets build/Adriaan Moors2016-05-171-5/+5
| * | Eliminate major sources of daily noise in SBT build.Jason Zaugg2016-05-163-4/+41
| |/
* | Merge pull request #5090 from som-snytt/issue/9740-repl-bad-importLukas Rytz2016-05-118-92/+80
|\ \
| * | SI-9740 Repl import fix -Yrepl-class-basedSom Snytt2016-05-028-92/+80
| |/
* | Merge pull request #5128 from szeiger/wip/sbt-ivy-2.11Jason Zaugg2016-05-112-26/+53
|\ \ | |/ |/|
| * Publish usable Scala distributions to Ivy repositoriesStefan Zeiger2016-05-062-26/+53
* | Merge pull request #5139 from SethTisue/disable-integrate-ideAdriaan Moors2016-04-281-0/+4
|\ \
| * | disable integrate/ide script on 2.11.xSeth Tisue2016-04-281-0/+4
* | | CI: hardcode java path in integrate/windows scriptAdriaan Moors2016-04-211-5/+6
* | | Merge pull request #5113 from adriaanm/ci-win-java6Adriaan Moors2016-04-211-0/+3
|\ \ \
| * | | CI: use java 6 for windows integrationAdriaan Moors2016-04-211-0/+3
|/ / /
* | | SI-9734 Narrow type when import REPL history (#5084)som-snytt2016-04-203-1/+41
* | | SI-9735 REPL prefer standard escapes for code text (#5086)som-snytt2016-04-203-4/+48