Permalink
Browse files

Update COPYRIGHT to reference zpios CDDL exceptions.

  • Loading branch information...
1 parent 94d52d9 commit fa94cf43b915fbb13e039886a572682d48365ac8 @behlendorf committed May 18, 2010
Showing with 7 additions and 1 deletion.
  1. +7 −1 COPYRIGHT
View
@@ -10,6 +10,10 @@ and attributed properly. These exceptions include, but are not limited
to, the vdev_disk.c and zvol.c implementation which are licensed under
the CDDL.
+The zpios test code is originally derived from the Lustre pios test code
+which is licenced under the GPLv2. As such the heaviliy modified zpios
+kernel test code also remains licensed under the GPLv2.
+
The latest stable and development versions of this port can be downloaded
from the official ZFS on Linux site located at:
@@ -21,5 +25,7 @@ between the U.S. Department of Energy (DOE) and Lawrence Livermore
National Security, LLC (LLNS) for the operation of LLNL. It has been
approved for release under LLNL-CODE-403049.
-This package is distributed under the terms of the CDDL. See the file
+Unless otherwise noted, all files in this distribution are released
+under the Common Development and Distribution License (CDDL).
+Exceptions are noted within the associated source files. See the file
OPENSOLARIS.LICENSE for more information.

0 comments on commit fa94cf4

Please sign in to comment.