New upstream version 0.7.11

[mirror_zfs-debian.git] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 8b66fe7a42067870b78aa42651af8ce2c4593b20..759a48439bfa72f760d1150082c223baa90680da 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -10,10 +10,14 @@ 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 licensed under the GPLv2.  As such the heavily 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:
 
-http://github.com/behlendorf/zfs/
+http://zfsonlinux.org/
 
 This ZFS on Linux port was produced at the Lawrence Livermore National
 Laboratory (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44)
@@ -21,5 +25,9 @@ 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.
+
+Refer to the git commit log for authoritative copyright attribution.