George Melikov 160af77108 OpenZFS 7340 - receive manual origin should override automatic origin ... Authored by: Paul Dagnelie <pcd@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Ported-by: George Melikov <mail@gmelikov.ru> OpenZFS-issue: https://www.illumos.org/issues/7340 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/ed4e7a6 Closes #5681		2017-01-27 11:47:54 -08:00
..
.gitignore	Add a pkgconfig file	2014-08-28 07:59:43 -07:00
libzfs_changelist.c	Fix coverity defects: CID 147654, 147690	2016-10-13 14:02:07 -07:00
libzfs_config.c	Fix indefinite article	2016-08-11 11:23:49 -07:00
libzfs_core.pc.in	Add a pkgconfig file	2014-08-28 07:59:43 -07:00
libzfs_dataset.c	OpenZFS 7386 - zfs get does not work properly with bookmarks	2017-01-26 14:42:15 -08:00
libzfs_diff.c	Fix coverity defects: CID 147475	2016-12-09 11:59:36 -07:00
libzfs_fru.c	cstyle: Resolve C style issues	2013-12-18 16:46:35 -08:00
libzfs_import.c	Use cstyle -cpP in make cstyle check	2016-12-12 10:46:26 -08:00
libzfs_iter.c	OpenZFS 6328 - Fix cstyle errors in zfs codebase	2017-01-12 09:42:11 -08:00
libzfs_mount.c	OpenZFS 7336 - vfork and O_CLOEXEC causes zfs_mount EBUSY	2017-01-26 12:28:29 -08:00
libzfs_pool.c	Add realloc() success check in zpool_history_unpack()	2017-01-27 11:10:10 -08:00
libzfs_sendrecv.c	OpenZFS 7340 - receive manual origin should override automatic origin	2017-01-27 11:47:54 -08:00
libzfs_status.c	Read spl_hostid module parameter before gethostid()	2015-02-04 16:44:53 -08:00
libzfs_util.c	OpenZFS 7386 - zfs get does not work properly with bookmarks	2017-01-26 14:42:15 -08:00
libzfs.pc.in	Add a pkgconfig file	2014-08-28 07:59:43 -07:00
Makefile.am	Add -c to zpool iostat & status to run command	2016-11-29 14:45:38 -07:00