svn commit: r230477 - in stable/8/cddl/contrib/opensolaris: cmd/zfs lib/libzfs/common

[Martin Matuska]

Author: mm
Date: Mon Jan 23 08:30:17 2012
New Revision: 230477
URL: http://svn.freebsd.org/changeset/base/230477

Log:
  MFC r230402, r230404:
  Add accidentially removed copyright lines in r228103
  
  Reported by:	pjd

Modified:
  stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
Directory Properties:
  stable/8/cddl/contrib/opensolaris/   (props changed)

Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Jan 23 08:29:58 2012	(r230476)
+++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Jan 23 08:30:17 2012	(r230477)
@@ -24,6 +24,7 @@
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * Copyright (c) 2011 Pawel Jakub Dawidek <pawel at dawidek.net>.
+ * All rights reserved.
  * Copyright (c) 2011 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
  */
 

Modified: stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Mon Jan 23 08:29:58 2012	(r230476)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Mon Jan 23 08:30:17 2012	(r230477)
@@ -22,6 +22,8 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2011 Pawel Jakub Dawidek <pawel at dawidek.net>.
+ * All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * All rights reserved.
  */