diff options
author | Brian Behlendorf <[email protected]> | 2010-05-18 14:25:28 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2010-05-18 14:25:28 -0700 |
commit | fa94cf43b915fbb13e039886a572682d48365ac8 (patch) | |
tree | 666e3a8fb81bf5fd0b32b6d90b1aedc124c94e05 | |
parent | 94d52d93d9efbdad47a3923277a417c88a3c9de6 (diff) |
Update COPYRIGHT to reference zpios CDDL exceptions.
-rw-r--r-- | COPYRIGHT | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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. |