Date: Sun, 30 Oct 2011 21:02:01 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r226945 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201110302102.p9UL21GX084696@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Sun Oct 30 21:02:01 2011 New Revision: 226945 URL: http://svn.freebsd.org/changeset/base/226945 Log: MFC r226724, r226732: MFC r226724: Update copyright information in several ZFS files, as the clause 3.3 of the CDDL licence explicitly requires every Contributor to add a copyright notice. This also reflects the copyright notices for the changes recently added by Illumos. MFC r226732: [1] Fix typo in copyright notice introduced in r226724 (missing character in e-mail adress) Reported by: pjd [1] Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c Sun Oct 30 20:58:53 2011 (r226944) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c Sun Oct 30 21:02:01 2011 (r226945) @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Portions Copyright 2011 iXsystems, Inc */ #include <sys/zfs_context.h> Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Sun Oct 30 20:58:53 2011 (r226944) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Sun Oct 30 21:02:01 2011 (r226945) @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> */ #include <sys/zfs_context.h> Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sun Oct 30 20:58:53 2011 (r226944) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sun Oct 30 21:02:01 2011 (r226945) @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> */ #include <sys/types.h> Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sun Oct 30 20:58:53 2011 (r226944) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c Sun Oct 30 21:02:01 2011 (r226945) @@ -23,6 +23,7 @@ */ /* Portions Copyright 2007 Jeremy Teo */ +/* Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> */ #ifdef _KERNEL #include <sys/types.h> Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Sun Oct 30 20:58:53 2011 (r226944) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c Sun Oct 30 21:02:01 2011 (r226945) @@ -26,6 +26,7 @@ */ /* Portions Copyright 2010 Robert Milkowski */ +/* Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> */ /* * ZFS volume emulation driver.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110302102.p9UL21GX084696>