K 10 svn:author V 3 avg K 8 svn:date V 27 2017-10-06T08:17:12.802502Z K 7 svn:log V 605 MFV r316934: 7340 receive manual origin should override automatic origin illumos/illumos-gate@ed4e7a6a5cbc5e8986dc649ad54435210487b102 https://github.com/illumos/illumos-gate/commit/ed4e7a6a5cbc5e8986dc649ad54435210487b102 https://www.illumos.org/issues/7340 When -o origin= is specified as part of a ZFS receive, that origin should override the automatic detection in libzfs. Reviewed by: George Wilson Reviewed by: Matthew Ahrens Approved by: Robert Mustacchi Author: Paul Dagnelie MFC after: 3 weeks END