[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.5.4-656-g492a0bd

[Aron Xu]

The following commit has been merged in the master branch:
commit 492a0bd1b79d3723c29ac4e94d83eb9f003c9592
Author: Aron Xu <aron at debian.org>
Date:   Fri Feb 5 18:44:25 2016 +0800

    Add BSD-2-clause license information

diff --git a/debian/copyright b/debian/copyright
index 1c194d9..df3be28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -126,6 +126,14 @@ Files: debian/tree/zfsutils/usr/share/bash-completion/completions/zfs
 Copyright: 2013, Aneurin Price <aneurin.price at gmail.com>
 License: Expat
 
+Files: etc/init.d/zfs-*.in
+Copyright:
+ Tuco Xyz <tuco.xyz at gmail.com>,
+ Petr Salinger <Petr.Salinger at seznam.cz>,
+ Aurelien Jarno <aurel32 at debian.org>,
+ Lawrence Livermore National Security, LLC.
+License: BSD-2-clause
+
 Files: include/libnvpair.h
 Copyright: Oracle
 License: CDDL-1.0
@@ -1563,3 +1571,27 @@ License: CDDL-1.0
  of rights under this License and You agree to work with Initial Developer and
  Contributors to distribute such responsibility on an equitable basis. Nothing
  herein is intended or shall be deemed to constitute any admission of liability.
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
OpenZFS on Linux