]> git.proxmox.com Git - mirror_zfs.git/commit
OpenZFS 7340 - receive manual origin should override automatic origin
authorGeorge Melikov <mail@gmelikov.ru>
Fri, 27 Jan 2017 19:47:54 +0000 (22:47 +0300)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 27 Jan 2017 19:47:54 +0000 (11:47 -0800)
commit160af771081bc21313ad0c111d66b348932fe5d2
tree58855f1aeb448c5a27ad7ab6c29c946651e938fe
parenta08abc1bb3e354d8c352c91d22cc733a84fafb50
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
lib/libzfs/libzfs_sendrecv.c