From owner-cvs-src-old@FreeBSD.ORG  Mon Dec 14 17:05:12 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD0C41065692
	for <cvs-src-old@freebsd.org>; Mon, 14 Dec 2009 17:05:12 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 991DA8FC33
	for <cvs-src-old@freebsd.org>; Mon, 14 Dec 2009 17:05:12 +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 nBEH5C2J031555
	for <cvs-src-old@freebsd.org>; Mon, 14 Dec 2009 17:05:12 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBEH5Cbo031554
	for cvs-src-old@freebsd.org; Mon, 14 Dec 2009 17:05:12 GMT
	(envelope-from delphij@repoman.freebsd.org)
Message-Id: <200912141705.nBEH5Cbo031554@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	delphij@repoman.freebsd.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 14 Dec 2009 17:04:44 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/cddl/contrib/opensolaris/cmd/zfs zfs_main.c
 src/cddl/contrib/opensolaris/lib/libzfs/common
 libzfs.h libzfs_sendrecv.c
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: Mon, 14 Dec 2009 17:05:12 -0000

delphij     2009-12-14 17:04:44 UTC

  FreeBSD src repository

  Modified files:
    cddl/contrib/opensolaris/cmd/zfs zfs_main.c 
    cddl/contrib/opensolaris/lib/libzfs/common libzfs.h 
                                               libzfs_sendrecv.c 
  Log:
  SVN rev 200516 on 2009-12-14 17:04:44Z by delphij
  
  Add an option to specify that the received ZFS should not be automatically
  mounted (receive -u).
  
  Obtained from:  OpenSolaris (onnv revision 8584:327a1b6dd944)
  Approved by:    pjd
  
  Revision  Changes    Path
  1.5       +5 -2      src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  1.7       +4 -1      src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  1.4       +2 -2      src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c