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>

*** 18,34 ****
  #
  # CDDL HEADER END
  #
  #
  # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2011 by Delphix. All rights reserved.
  #
  
  LIBRARY= libzfs.a
  VERS= .1
  
  OBJS_SHARED=                    \
          zfs_comutil.o           \
          zfs_deleg.o             \
          zfs_fletcher.o          \
          zfs_namecheck.o         \
          zfs_prop.o              \
--- 18,35 ----
  #
  # CDDL HEADER END
  #
  #
  # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
  LIBRARY= libzfs.a
  VERS= .1
  
  OBJS_SHARED=                    \
+         zfeature_common.o       \
          zfs_comutil.o           \
          zfs_deleg.o             \
          zfs_fletcher.o          \
          zfs_namecheck.o         \
          zfs_prop.o              \