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
..
compat/opensolaris	Honor all options of "zfs mount -o"	2017-09-05 19:28:35 +00:00
contrib/opensolaris	MFV r316934: 7340 receive manual origin should override automatic origin	2017-10-06 08:17:12 +00:00
lib	MFV r323530,r323533,r323534: 7431 ZFS Channel Programs, and followups	2017-10-01 16:11:07 +00:00
sbin	MFV r323530,r323533,r323534: 7431 ZFS Channel Programs, and followups	2017-10-01 16:11:07 +00:00
tests	Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed	2016-05-04 23:20:53 +00:00
usr.bin	Convert traditional ${MK_TESTS} conditional idiom for including test	2017-08-02 08:35:51 +00:00
usr.sbin	Close a memory leak when using zpool_read_all_labels	2017-09-25 20:44:40 +00:00
Makefile	Convert traditional ${MK_TESTS} conditional idiom for including test	2017-08-02 08:35:51 +00:00
Makefile.inc