From fa94cf43b915fbb13e039886a572682d48365ac8 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 18 May 2010 14:25:28 -0700 Subject: [PATCH] Update COPYRIGHT to reference zpios CDDL exceptions. --- COPYRIGHT | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/COPYRIGHT b/COPYRIGHT index 8b66fe7..ea26f17 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -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. -- 1.8.3.1