summaryrefslogtreecommitdiff
path: root/usr/src/cmd/Makefile
diff options
context:
space:
mode:
authorChristopher Siden <chris.siden@delphix.com>2012-05-21 12:11:39 -0700
committerChristopher Siden <chris.siden@delphix.com>2012-05-21 12:11:39 -0700
commitad135b5d644628e791c3188a6ecbd9c257961ef8 (patch)
treef512d6987edc7d3ae208f050b4d6e1440c40186c /usr/src/cmd/Makefile
parentdded0839cf719e5b347c41adf4fa9debf68d02d9 (diff)
downloadillumos-joyent-ad135b5d644628e791c3188a6ecbd9c257961ef8.tar.gz
2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags Reviewed by: Matt Ahrens <mahrens@delphix.com> Reviewed by: George Wilson <gwilson@delphix.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com> Approved by: Eric Schrock <Eric.Schrock@delphix.com>
Diffstat (limited to 'usr/src/cmd/Makefile')
-rw-r--r--usr/src/cmd/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile
index b74bf7e9d1..876de62510 100644
--- a/usr/src/cmd/Makefile
+++ b/usr/src/cmd/Makefile
@@ -22,6 +22,7 @@
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2010 Nexenta Systems, Inc. All rights reserved.
# Copyright 2011 Joyent, Inc. All rights reserved.
+# Copyright (c) 2012 by Delphix. All rights reserved.
include ../Makefile.master
@@ -454,6 +455,7 @@ COMMON_SUBDIRS= \
zdb \
zdump \
zfs \
+ zhack \
zic \
zinject \
zlogin \