Merge commit '0b2e8253986c5c761129b58cfdac46d204903de1'
commit21d81c8e523af8dda590be487646c176dab635bb
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 18:10:12 +0000 (21 14:10 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 18:10:12 +0000 (21 14:10 -0400)
tree1933bdb1d53841863470339888443954c1c350a6
parent27336ef0e51139238aba4d1e6ce6b396f0a526b9
parent0b2e8253986c5c761129b58cfdac46d204903de1
Merge commit '0b2e8253986c5c761129b58cfdac46d204903de1'
kernel/fs/zfs/sys/dsl_pool.h
usr/src/cmd/zfs/zfs_main.c
usr/src/lib/Makefile
usr/src/lib/libzfs/Makefile.com
usr/src/lib/libzfs/common/libzfs.h
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/lib/libzfs/common/libzfs_mount.c
usr/src/pkg/manifests/system-test-zfstest.mf