summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-16 13:06:38 +1000
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-07-15 22:32:43 -0700
commita2973dfd954c0c094f956becb05a82bee5f7da01 (patch)
tree2135ee1616ff3920d00c35046be2037af9aa3a3f /doc
parentfa8012d28687986902ce1255a19f9f49affb3bca (diff)
downloadscala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.gz
scala-a2973dfd954c0c094f956becb05a82bee5f7da01.tar.bz2
scala-a2973dfd954c0c094f956becb05a82bee5f7da01.zip
Remove further references to forkjoin
Use j.u.c.Forkjoin directly in active and disabled tests Remove bitrotted benchmarks code I was going to update these to use `java.util.concurrent.ForkJoin` directly, instead of our deprecated stubs. But most of them don't compile anymore (e.g. scala.testing.Benchmark has been removed, ClassTag imports missing). While I'm all for benchmarks, we should have large swathes of code checked in that isn't at compiled and run automatically. I'm happy to help someone resurrect these in a suitable form.
Diffstat (limited to 'doc')
-rw-r--r--doc/LICENSE.md4
-rw-r--r--doc/License.rtf6
2 files changed, 0 insertions, 10 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md
index 6b039afd68..6eab02548d 100644
--- a/doc/LICENSE.md
+++ b/doc/LICENSE.md
@@ -61,8 +61,4 @@ This license is used by the following third-party libraries:
* sizzle
* tools tooltip
-### Public Domain
-The following libraries are freely available in the public domain:
-
- * forkjoin
diff --git a/doc/License.rtf b/doc/License.rtf
index 62ec2d023c..541f4d7996 100644
--- a/doc/License.rtf
+++ b/doc/License.rtf
@@ -57,9 +57,3 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \'93AS IS\'9
\'95 jquery-layout\
\'95 sizzle\
\'95 tools tooltip\
-
-\fs30 \
-Public Domain\
-
-\fs26 The following libraries are freely available in the public domain:\
- \'95 forkjoin} \ No newline at end of file