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>

*** 20,47 ****
  #
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
! # ident "%Z%%M% %I%     %E% SMI"
  #
  
  LIBRARY=        libnvpair.a
  VERS=           .1
  
  OBJECTS=        libnvpair.o \
                  nvpair_alloc_system.o \
                  nvpair_alloc_fixed.o \
!                 nvpair.o
  
  include ../../Makefile.lib
  include ../../Makefile.rootfs
  
  SRCS=           ../libnvpair.c \
                  ../nvpair_alloc_system.c \
                  $(SRC)/common/nvpair/nvpair_alloc_fixed.c \
!                 $(SRC)/common/nvpair/nvpair.c
  
  #
  # Libraries added to the next line must be present in miniroot
  #
  LDLIBS +=       -lc -lnsl
--- 20,49 ----
  #
  #
  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  # Use is subject to license terms.
  #
! # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
  LIBRARY=        libnvpair.a
  VERS=           .1
  
  OBJECTS=        libnvpair.o \
                  nvpair_alloc_system.o \
                  nvpair_alloc_fixed.o \
!                 nvpair.o \
!                 fnvpair.o
  
  include ../../Makefile.lib
  include ../../Makefile.rootfs
  
  SRCS=           ../libnvpair.c \
                  ../nvpair_alloc_system.c \
                  $(SRC)/common/nvpair/nvpair_alloc_fixed.c \
!                 $(SRC)/common/nvpair/nvpair.c \
!                 $(SRC)/common/nvpair/fnvpair.c
  
  #
  # Libraries added to the next line must be present in miniroot
  #
  LDLIBS +=       -lc -lnsl