Andriy Gapon c40fbcbc18 MFV r316934: 7340 receive manual origin should override automatic origin ... illumos/illumos-gate@ed4e7a6a5c ed4e7a6a5c 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		2017-10-06 08:17:12 +00:00
..
cmd	MFV r316864: 6392 zdb: introduce -V for verbatim import	2017-10-06 08:09:20 +00:00
common	Recursively enumerate anonymous structs and unions in ctf_member_info().	2016-08-30 05:50:42 +00:00
head	MFV r270197:	2014-08-22 22:13:36 +00:00
lib	MFV r316934: 7340 receive manual origin should override automatic origin	2017-10-06 08:17:12 +00:00
tools/ctf	Revert r253678, r253661:	2016-12-03 17:44:43 +00:00
OPENSOLARIS.LICENSE