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

Merge commit 'refs/top-bases/fix-list' into fix-list

This commit is contained in:
Brian Behlendorf 2010-05-18 10:39:07 -07:00
parent 4d4cda51e2 91ac110c9c
commit 0de170f8e3
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
COPYRIGHT
View File

@ -1,6 +1,14 @@
The bulk of the library is Copyright 2004 Sun Microsystems, Inc. The majority of the code is this project comes from OpenSolaris which
Portions are Copyright 2006 OmniTI, Inc. 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 library is distributed under the terms of the CDDL. http://dlc.sun.com/osol/on/downloads/b121/on-src.tar.bz2
See the file OPENSOLARIS.LICENSE for more information.
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.
This package is distributed under the terms of the CDDL. See the file
OPENSOLARIS.LICENSE for more information.

36
DISCLAIMER
View File

@ -1,22 +1,24 @@
This notice is required to be provided under our contract with the This work was produced at the Lawrence Livermore National Laboratory
U.S. Department of Energy (DOE). This work was produced at the (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
Lawrence Livermore National Laboratory under Contract with the DOE. the U.S. Department of Energy (DOE) and Lawrence Livermore National
Security, LLC (LLNS) for the operation of LLNL.
Neither the United States Government nor the Lawrence Livermore National This work was prepared as an account of work sponsored by an agency of
Security, LLC. nor any of their employees, makes any warranty, express the United States Government. Neither the United States Government nor
or implied, or assumes any liability or responsibility for the accuracy, Lawrence Livermore National Security, LLC nor any of their employees,
completeness, or usefulness of any information, apparatus, product, makes any warranty, express or implied, or assumes any liability or
or process disclosed, or represents that its use would not infringe responsibility for the accuracy, completeness, or usefulness of any
privately-owned rights. information, apparatus, product, or process disclosed, or represents
that its use would not infringe privately-owned rights.
Also, reference herein to any specific commercial products, process, Reference herein to any specific commercial products, process, or
or services by trade name, trademark, manufacturer or otherwise does services by trade name, trademark, manufacturer or otherwise does
not necessarily constitute or imply its endorsement, recommendation, not necessarily constitute or imply its endorsement, recommendation,
or favoring by the United States Government or the Lawrence Livermore or favoring by the United States Government or Lawrence Livermore
National Security, LLC. The views and opinions of authors expressed National Security, LLC. The views and opinions of authors expressed
herein do not necessarily state or reflect those of the United States herein do not necessarily state or reflect those of the Untied States
Government or the Lawrence Livermore National Security, LLC., and Government or Lawrence Livermore National Security, LLC, and shall
shall not be used for advertising or product endorsement purposes. not be used for advertising or product endorsement purposes.
The precise terms and conditions for copying, distribution and The precise terms and conditions for copying, distribution, and
modification are specified in the file "COPYING". modification are specified in the file "COPYING".