From owner-cvs-src-old@FreeBSD.ORG  Wed May  5 18:26:18 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3D0C4106566C
	for <cvs-src-old@freebsd.org>; Wed,  5 May 2010 18:26:18 +0000 (UTC)
	(envelope-from mm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 282FA8FC08
	for <cvs-src-old@freebsd.org>; Wed,  5 May 2010 18:26:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o45IQIiI053018
	for <cvs-src-old@freebsd.org>; Wed, 5 May 2010 18:26:18 GMT
	(envelope-from mm@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o45IQIwa053017
	for cvs-src-old@freebsd.org; Wed, 5 May 2010 18:26:18 GMT
	(envelope-from mm@repoman.freebsd.org)
Message-Id: <201005051826.o45IQIwa053017@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	mm@repoman.freebsd.org using -f
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 5 May 2010 18:22:29 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/cddl/contrib/opensolaris/cmd/zpool zpool_main.c
 src/cddl/contrib/opensolaris/cmd/ztest
 ztest.c src/cddl/contrib/opensolaris/lib/libzfs/common libzfs.h
 libzfs_pool.c src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs spa.c
 zfs_ioctl.c src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys spa.h
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 May 2010 18:26:18 -0000

mm          2010-05-05 18:22:29 UTC

  FreeBSD src repository

  Modified files:
    cddl/contrib/opensolaris/cmd/zpool zpool_main.c 
    cddl/contrib/opensolaris/cmd/ztest ztest.c 
    cddl/contrib/opensolaris/lib/libzfs/common libzfs.h 
                                               libzfs_pool.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs spa.c 
                                                   zfs_ioctl.c 
    sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys spa.h 
  Log:
  SVN rev 207670 on 2010-05-05 18:22:29Z by mm
  
  Introduce hardforce export option (-F) for "zpool export".
  When exporting with this flag, zpool.cache remains untouched.
  
  OpenSolaris onnv revision: 8211:32722be6ad3b
  
  Approved by:    pjd, delphij (mentor)
  Obtained from:  OpenSolaris (Bug ID: 6775357)
  
  Revision  Changes    Path
  1.6       +10 -2     src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  1.6       +1 -1      src/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  1.9       +1 -0      src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  1.4       +14 -1     src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  1.11      +13 -8     src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  1.5       +2 -1      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  1.22      +2 -1      src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c