]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - contrib/unbound/libunbound/python/examples/reverse-lookup.py
MFV r316934: 7340 receive manual origin should override automatic origin
authorAndriy Gapon <avg@FreeBSD.org>
Fri, 6 Oct 2017 08:17:12 +0000 (08:17 +0000)
committerAndriy Gapon <avg@FreeBSD.org>
Fri, 6 Oct 2017 08:17:12 +0000 (08:17 +0000)
commitc40fbcbc181f4febb7c2c47a31c06fae6525a1a0
tree6e1c1bc6549cc7771cee5fa662ae514440c7d3e5
parent3c7b32b89046e19f0dd7b94f17ff8a6c92fc6b5e
parent89a08ff6ba190602d9c71ae1d224f9374958547a
MFV r316934: 7340 receive manual origin should override automatic origin

illumos/illumos-gate@ed4e7a6a5cbc5e8986dc649ad54435210487b102
https://github.com/illumos/illumos-gate/commit/ed4e7a6a5cbc5e8986dc649ad54435210487b102

https://www.illumos.org/issues/7340
  When -o origin=<snapshot> is specified as part of a ZFS receive, that origin
  should override the automatic detection in libzfs.

Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Author: Paul Dagnelie <pcd@delphix.com>

MFC after: 3 weeks
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c