Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-libspl' into linux-libspl

This commit is contained in:
Brian Behlendorf 2010-05-18 14:34:49 -07:00
parent c98946e318 7861d7e154
commit 99826a62d5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
COPYRIGHT
View File

@ -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 to, the vdev_disk.c and zvol.c implementation which are licensed under
the CDDL. 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 The latest stable and development versions of this port can be downloaded
from the official ZFS on Linux site located at: 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 National Security, LLC (LLNS) for the operation of LLNL. It has been
approved for release under LLNL-CODE-403049. 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. OPENSOLARIS.LICENSE for more information.