aboutsummaryrefslogtreecommitdiff
path: root/cddl/sbin
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-06-11 11:35:22 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-06-11 11:35:22 +0000
commit2d9cf57e18654edda53bcb460ca66641ba69ed75 (patch)
treea0efb9ad759cc8c8f8ec6f2cbabe6b3305a334e9 /cddl/sbin
parent7561cb5c8b386140f01f0d6b0560fee7f5127dd6 (diff)
downloadsrc-2d9cf57e18654edda53bcb460ca66641ba69ed75.tar.gz
src-2d9cf57e18654edda53bcb460ca66641ba69ed75.zip
Introduce "feature flags" for ZFS pools (bump SPA version to 5000).
Add first feature "com.delphix:async_destroy" (asynchronous destroy of ZFS datasets). Implement features support in ZFS boot code. Illumos revisions merged: 13700:2889e2596bd6 13701:1949b688d5fb 2619 asynchronous destruction of ZFS file systems 2747 SPA versioning with zfs feature flags References: https://www.illumos.org/issues/2619 https://www.illumos.org/issues/2747 Obtained from: illumos (issue #2619, #2747) MFC after: 1 month
Notes
Notes: svn path=/head/; revision=236884
Diffstat (limited to 'cddl/sbin')
-rw-r--r--cddl/sbin/zpool/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index fba9ebfee604..327f6dc82e61 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -5,7 +5,7 @@
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
PROG= zpool
-MAN= zpool.8
+MAN= zpool.8 zpool-features.5
SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c
SRCS+= timestamp.c