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>

*** 17,28 ****
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  #
- #
  # This file defines the current capabilities of GRUB over and above that
  # supported by the standard distribution
  #
  # The version field contains the version of the associated GRUB software.
  # The version is incremented by .1 (minor version number) each time there
--- 17,28 ----
  # information: Portions Copyright [yyyy] [name of copyright owner]
  #
  # CDDL HEADER END
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  # This file defines the current capabilities of GRUB over and above that
  # supported by the standard distribution
  #
  # The version field contains the version of the associated GRUB software.
  # The version is incremented by .1 (minor version number) each time there
*** 37,46 ****
  # integer increments until Live Upgrade is fixed.
  #
  # This file and the associated version are Solaris specific and are
  # not a part of the open source distribution of GRUB.
  #
! VERSION=20
  dboot
  xVM
  zfs
  findroot
--- 37,46 ----
  # integer increments until Live Upgrade is fixed.
  #
  # This file and the associated version are Solaris specific and are
  # not a part of the open source distribution of GRUB.
  #
! VERSION=21
  dboot
  xVM
  zfs
  findroot