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: Dan McDonald <danmcd@nexenta.com>

*** 7,17 ****
--- 7,20 ----
  # A full copy of the text of the CDDL should have accompanied this
  # source.  A copy of the CDDL is also available via the Internet
  # at http://www.illumos.org/license/CDDL.
  #
  
+ #
  # Copyright 2011, Richard Lowe
+ # Copyright (c) 2012 by Delphix. All rights reserved.
+ #
  
  include ../../Makefile.master
  
  MANSECT =       5
  
*** 109,119 ****
                  tecla.5                 \
                  term.5                  \
                  threads.5               \
                  trusted_extensions.5    \
                  vgrindefs.5             \
!                 zones.5
  
  MANSOFILES =    ANSI.5          \
                  C++.5           \
                  C.5             \
                  CSI.5           \
--- 112,123 ----
                  tecla.5                 \
                  term.5                  \
                  threads.5               \
                  trusted_extensions.5    \
                  vgrindefs.5             \
!                 zones.5                 \
!                 zpool-features.5
  
  MANSOFILES =    ANSI.5          \
                  C++.5           \
                  C.5             \
                  CSI.5           \