Merge illumos-gate
commitd8b1034f15a7aa6326cabcbbb372c5dad67e8ef4
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 3 Mar 2019 21:30:42 +0000 (3 16:30 -0500)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Sun, 3 Mar 2019 21:30:42 +0000 (3 16:30 -0500)
tree13705d86e5b10a612a658f496d278d0f7f7d09a8
parente7482b7c8d9ab76edbce18e9a5cddc856677d88d
parent04e56356520b98d5a93c496b10f02530bb6647e0
Merge illumos-gate
include/sys/fs/zfs.h
kernel/fs/zfs/common/zpool_prop.c
kernel/fs/zfs/spa.c
kernel/fs/zfs/spa_config.c
kernel/fs/zfs/zfs_ioctl.c
share/man/man8/zpool.8
usr/src/lib/libzfs/common/libzfs_pool.c
usr/src/pkg/manifests/system-test-zfstest.mf