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

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit 9ad51948ce08d214d49cd7aed93951adea020fd2
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sat Mar 5 21:11:46 2016 +0100

    List forgotten man page copyright holders.
    
    Discovered using license-reconcile.

diff --git a/debian/copyright b/debian/copyright
index d0dd8e6..12a00e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -762,6 +762,50 @@ Copyright: 2014, Delphix.
   2010, Sun Microsystems, Inc.
 License: CDDL-1.0
 
+Files: man/man1/zhack.1
+       man/man1/zpios.1
+       man/man8/mount.zfs.8
+       man/man8/zinject.8
+Copyright: 2013, Darik Horn <dajhorn at vanadac.com>
+License: CDDL-1.0
+
+Files: man/man1/ztest.1
+Copyright: 2009, Oracle and/or its affiliates.
+  2009, Michael Gebetsroither <michael.geb at gmx.at>
+License: CDDL-1.0
+
+Files: man/man5/zfs-events.5
+       man/man5/zfs-module-parameters.5
+Copyright: 2013, Turbo Fredriksson <turbo at bayour.com>
+License: CDDL-1.0
+
+Files: man/man5/zpool-features.5
+Copyright:
+  2013, Delphix
+  2013, Saso Kiselkov
+  2014, Joyent, Inc.
+License: CDDL-1.0
+
+Files: man/man8/zdb.8
+Copyright: 2012, Richard Lowe.
+  2012, Delphix
+License: CDDL-1.0
+
+Files: man/man8/zed.8.in
+Copyright: 2013-2014, Lawrence Livermore National Security, LLC.
+License: CDDL-1.0
+
+Files: man/man8/zpool.8
+Copyright: 2007, Sun Microsystems, Inc.
+  2011, Nexenta Systems, Inc.
+  2012, Cyril Plisko
+  2013, Delphix
+License: CDDL-1.0
+
+Files: man/man8/zstreamdump.8
+Copyright: 2009, Sun Microsystems, Inc.
+License: CDDL-1.0
+
 Files: module/*
 Copyright: 2011-2014, Delphix.
   2007, 2009, 2010, Sun Microsystems, Inc.

-- 
OpenZFS on Linux