Skip to content

Commit fa94cf4

Browse files
committed
Update COPYRIGHT to reference zpios CDDL exceptions.
1 parent 94d52d9 commit fa94cf4

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

COPYRIGHT

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ and attributed properly. These exceptions include, but are not limited
1010
to, the vdev_disk.c and zvol.c implementation which are licensed under
1111
the CDDL.
1212

13+
The zpios test code is originally derived from the Lustre pios test code
14+
which is licenced under the GPLv2. As such the heaviliy modified zpios
15+
kernel test code also remains licensed under the GPLv2.
16+
1317
The latest stable and development versions of this port can be downloaded
1418
from the official ZFS on Linux site located at:
1519

@@ -21,5 +25,7 @@ between the U.S. Department of Energy (DOE) and Lawrence Livermore
2125
National Security, LLC (LLNS) for the operation of LLNL. It has been
2226
approved for release under LLNL-CODE-403049.
2327

24-
This package is distributed under the terms of the CDDL. See the file
28+
Unless otherwise noted, all files in this distribution are released
29+
under the Common Development and Distribution License (CDDL).
30+
Exceptions are noted within the associated source files. See the file
2531
OPENSOLARIS.LICENSE for more information.

0 commit comments

Comments
 (0)