From owner-svn-src-all@freebsd.org Fri Apr 14 17:43:53 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23D56D3EAFD; Fri, 14 Apr 2017 17:43:53 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9C0F3B7; Fri, 14 Apr 2017 17:43:52 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3EHhqEP052307; Fri, 14 Apr 2017 17:43:52 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3EHhqIt052306; Fri, 14 Apr 2017 17:43:52 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201704141743.v3EHhqIt052306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 14 Apr 2017 17:43:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r316879 - vendor/illumos/dist/man/man1m X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2017 17:43:53 -0000 Author: avg Date: Fri Apr 14 17:43:51 2017 New Revision: 316879 URL: https://svnweb.freebsd.org/changeset/base/316879 Log: missing zfs.1m changes from r286704 Modified: vendor/illumos/dist/man/man1m/zfs.1m Modified: vendor/illumos/dist/man/man1m/zfs.1m ============================================================================== --- vendor/illumos/dist/man/man1m/zfs.1m Fri Apr 14 17:38:43 2017 (r316878) +++ vendor/illumos/dist/man/man1m/zfs.1m Fri Apr 14 17:43:51 2017 (r316879) @@ -175,11 +175,13 @@ .Nm .Cm receive .Op Fl Fnuv +.Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm .Cm receive .Op Fl Fnuv .Op Fl d Ns | Ns Fl e +.Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem .Nm .Cm allow @@ -2635,12 +2637,14 @@ origin, etc. .Nm .Cm receive .Op Fl Fnuv +.Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .br .Nm .Cm receive .Op Fl Fnuv .Op Fl d Ns | Ns Fl e +.Op Fl o Sy origin Ns = Ns Ar snapshot .Ar filesystem .Xc Creates a snapshot whose contents are as specified in the stream provided on @@ -2730,6 +2734,10 @@ snapshot as described in the paragraph a Do not actually receive the stream. This can be useful in conjunction with the .Fl v option to verify the name the receive operation would use. +.It Fl o Sy origin Ns = Ns Ar snapshot +Forces the stream to be received as a clone of the given snapshot. +This is only valid if the stream is an incremental stream whose source +is the same as the provided origin. .It Fl u File system that is associated with the received stream is not mounted. .It Fl v