diff options
| author | Tom Erickson <Tom.Erickson@Sun.COM> | 2009-11-09 20:45:32 -0800 |
|---|---|---|
| committer | Tom Erickson <Tom.Erickson@Sun.COM> | 2009-11-09 20:45:32 -0800 |
| commit | 92241e0b80813d0b83c08e730a29b9d1831794fc (patch) | |
| tree | ae911ea5f6928508430420730ad8dba20b5b3aa2 /usr/src/grub | |
| parent | 8d4cf8d8d2965ea43bccdc838f15c18634fee02d (diff) | |
| download | illumos-joyent-92241e0b80813d0b83c08e730a29b9d1831794fc.tar.gz | |
PSARC 2009/510 ZFS received properties
6850025 want to preserve local properties for zfs_recv
6839260 want zfs send with properties
6855486 zfs_receive should keep trying to set properties even after some fail
6850030 snapshots on read-only dataset shouldn't affect zfs_receive
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/capability | 2 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/grub/capability b/usr/src/grub/capability index 52a5473101..3ff9e80339 100644 --- a/usr/src/grub/capability +++ b/usr/src/grub/capability @@ -40,7 +40,7 @@ # This file and the associated version are Solaris specific and are # not a part of the open source distribution of GRUB. # -VERSION=13 +VERSION=14 dboot xVM zfs diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h b/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h index 4765afec8c..fe2ef8a62e 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h @@ -27,7 +27,7 @@ /* * On-disk version number. */ -#define SPA_VERSION 21ULL +#define SPA_VERSION 22ULL /* * The following are configuration names used in the nvlist describing a pool's |