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>

          --- old/usr/src/grub/capability
          +++ new/usr/src/grub/capability

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.

  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       22 +# Copyright (c) 2012 by Delphix. All rights reserved.
  22   23  #
  23      -#
  24   24  # This file defines the current capabilities of GRUB over and above that
  25   25  # supported by the standard distribution
  26   26  #
  27   27  # The version field contains the version of the associated GRUB software.
  28   28  # The version is incremented by .1 (minor version number) each time there
  29   29  # is a bugfix or enhancement of GRUB. In addition, the major version number
  30   30  # is bumped up by 1 every time a release boundary is crossed. Thus if in S11
  31   31  # the starting version is 3, in S12 the starting version will be 4.
  32   32  # Note that the first major number in each sequence is a whole integer
  33   33  # i.e. 2.0 is truncated to 2 and 3.0 is truncated to 3.
  34   34  #
  35   35  # NOTE: Live Upgrade is currently unable to handle decimal fractions (i.e.
  36   36  # minor version numbers) so the version number is being bumped up in
  37   37  # integer increments until Live Upgrade is fixed.
  38   38  #
  39   39  # This file and the associated version are Solaris specific and are
  40   40  # not a part of the open source distribution of GRUB.
  41   41  #
  42      -VERSION=20
       42 +VERSION=21
  43   43  dboot
  44   44  xVM
  45   45  zfs
  46   46  findroot
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX