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
..
libctf/common	Fix a memory leak in an error case in libctf.	2017-02-23 17:54:17 +00:00
libdtrace	Add a O_CLOEXEC use missed in r323166.	2017-09-12 14:38:10 +00:00
libgen/common	Mechanically convert cddl sun #ifdef's to illumos	2015-01-17 14:44:59 +00:00
libnvpair	MFV r302662: 6447 handful of nvpair cleanups	2016-09-01 15:17:39 +00:00
libuutil/common	cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c	2014-03-07 23:01:35 +00:00
libzfs/common	MFV r316934: 7340 receive manual origin should override automatic origin	2017-10-06 08:17:12 +00:00
libzfs_core/common	MFV r323913: 8600 ZFS channel programs - snapshot	2017-10-02 11:32:08 +00:00
libzpool/common	MFC r316858 7280 Allow changing global libzpool variables in zdb	2017-10-02 22:02:04 +00:00
pyzfs/common	MFV r260154 + 260182:	2014-01-02 07:34:36 +00:00