Author: mm Date: Mon Nov 21 15:33:37 2011 New Revision: 227795 URL: http://svn.freebsd.org/changeset/base/227795
Log: Fix mismerge in copyright of zpool(8). MFC after: 4 days Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 ============================================================================== --- head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Mon Nov 21 15:26:20 2011 (r227794) +++ head/cddl/contrib/opensolaris/cmd/zpool/zpool.8 Mon Nov 21 15:33:37 2011 (r227795) @@ -1,6 +1,5 @@ '\" te .\" Copyright (c) 2004, 2010, Oracle and/or its -.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. .\" affiliates. All rights reserved. .\" The contents of this file are subject to the .\" terms of the Common Development and Distribution License (the "License"). @@ -12,6 +11,9 @@ .\" If applicable, add the following below this CDDL HEADER, with the fields enclosed .\" by brackets "[]" replaced with your own identifying information: Portions .\" Copyright [yyyy] [name of copyright owner] +.\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved. +.\" Portions Copyright 2011 Justin T. Gibbs <gi...@freebsd.org> +.\" Portions Copyright 2011 Martin Matuska <m...@freebsd.org> .TH ZPOOL 8 "November 21, 2011" FreeBSD .SH NAME zpool \- configures ZFS storage pools _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
