aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-05-18 11:06:56 -0700
committerBrian Behlendorf <[email protected]>2010-05-18 11:06:56 -0700
commit94d52d93d9efbdad47a3923277a417c88a3c9de6 (patch)
tree01a3762b6cf173fd540c95afc3a10c3b11f52b43
parent91ac110c9ce29fcf81625cea81876b958564d384 (diff)
Update COPYRIGHT to include release id LLNL-CODE-403049.
-rw-r--r--COPYRIGHT27
1 files changed, 19 insertions, 8 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 1123393f7..8b66fe7a4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,14 +1,25 @@
-The majority of the code is this project comes from OpenSolaris which
-has been released under the CDDL open source license. This includes
-the core ZFS code, libavl, libnvpair, libefi, libunicode, and libutil.
-The original OpenSolaris source can be downloaded from:
+The majority of the code in the ZFS on Linux port comes from OpenSolaris
+which has been released under the terms of the CDDL open source license.
+This includes the core ZFS code, libavl, libnvpair, libefi, libunicode,
+and libutil. The original OpenSolaris source can be downloaded from:
http://dlc.sun.com/osol/on/downloads/b121/on-src.tar.bz2
-Files which do not originate from OpenSolaris are noted by a header
-and attributed properly. These exceptions include but are not limited
-to the vdev_disk.c and zvol.c implementation which are also licensed
-under the CDDL.
+Files which do not originate from OpenSolaris are noted in the file header
+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 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/
+
+This ZFS on Linux port was produced at the Lawrence Livermore National
+Laboratory (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44)
+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
OPENSOLARIS.LICENSE for more information.