summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [backport] Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-10-193-2/+7
* Merge pull request #5444 from retronym/topic/typer-debugJason Zaugg2016-10-161-1/+1
|\
| * Avoid tripping cyclic errors under -Ytyper-debugJason Zaugg2016-10-071-1/+1
|/
* Merge pull request #5405 from getfreebirdinc/2.11.xSeth Tisue2016-09-162-9/+9
|\
| * In ProcessBuilder docs, replace .lines w/ .lineStreamPaul Kernfeld2016-09-162-9/+9
|/
* Merge pull request #5199 from dwijnand/remove-scala-langStefan Zeiger2016-07-181-10/+14
|\
| * Make removing forkjoin dependant on the organization keyDale Wijnand2016-06-201-10/+14
* | Merge pull request #5236 from som-snytt/issue/triple-backportLukas Rytz2016-07-132-1/+9
|\ \ | |/ |/|
| * Avoid triple-quoting triple quotesSom Snytt2016-06-172-1/+9
* | Merge pull request #5190 from szeiger/wip/validate-test-use-sbtLukas Rytz2016-06-1921-92/+382
|\ \ | |/ |/|
| * Remove bnd warnings from log outputStefan Zeiger2016-06-141-1/+1
| * Use sbt for PR validationStefan Zeiger2016-06-1421-92/+382
|/
* Merge pull request #5219 from som-snytt/issue/9245Jason Zaugg2016-06-142-1/+28
|\
| * SI-9245 Fresher name in Try and testSom Snytt2016-06-072-1/+28
* | Merge pull request #5213 from som-snytt/issue/stringof-pariterableJason Zaugg2016-06-142-2/+59
|\ \
| * | SI-9737 [no-merge] Backport stringOf ParIterableNicolas Stucki2016-06-032-2/+59
* | | Merge pull request #5223 from FelAl/typo_fixJason Zaugg2016-06-141-2/+2
|\ \ \ | |_|/ |/| |
| * | Typo fixaf2016-06-101-2/+2
* | | 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
|/ / /