From owner-cvs-src-old@FreeBSD.ORG  Sun Jan  3 00:28:34 2010
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 A2DE510656A9
	for <cvs-src-old@freebsd.org>; Sun,  3 Jan 2010 00:28:34 +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 8F8AA8FC08
	for <cvs-src-old@freebsd.org>; Sun,  3 Jan 2010 00:28:34 +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 o030SYco058229
	for <cvs-src-old@freebsd.org>; Sun, 3 Jan 2010 00:28:34 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o030SYgt058228
	for cvs-src-old@freebsd.org; Sun, 3 Jan 2010 00:28:34 GMT
	(envelope-from delphij@repoman.freebsd.org)
Message-Id: <201001030028.o030SYgt058228@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: Sun, 3 Jan 2010 00:27:35 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
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: Sun, 03 Jan 2010 00:28:34 -0000

delphij     2010-01-03 00:27:35 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    cddl/contrib/opensolaris/cmd/zfs zfs_main.c 
    cddl/contrib/opensolaris/lib/libzfs/common libzfs.h 
                                               libzfs_sendrecv.c 
  Log:
  SVN rev 201407 on 2010-01-03 00:27:35Z by delphij
  
  MFC r200516:
  
  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.4.2.1   +5 -2      src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  1.6.2.1   +4 -1      src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  1.2.4.2   +2 -2      src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c